Commit 6323363b authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into 1924-basop-PortDFlpMr1899

parents 3e5cad68 40a7d9f4

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -215,7 +215,9 @@ typedef enum 


typedef enum

{

#ifndef FIX_1101_CLEANING_JBM_CALL

    TC_BUFFER_MODE_NONE = 0,

#endif

    TC_BUFFER_MODE_RENDERER,

    TC_BUFFER_MODE_BUFFER

} TC_BUFFER_MODE;

lib_com/ivas_prot_fx.h

+4 −0
Original line number Diff line number Diff line
@@ -3422,7 +3422,11 @@ void mctStereoIGF_enc_fx( 
    Encoder_State **sts,                                 /* i/o: encoder state structure                    */

    Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2],       /* i  : MDCT spectrum for ITF                      */

    Word16 q_origSpec,                                   /* i  : Q for MDCT spectrum                        */

#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC

    Word32 *powerSpec[MCT_MAX_CHANNELS],                 /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */

#else

    Word32 powerSpec_fx[MCT_MAX_CHANNELS][L_FRAME48k],   /* i/o: MDCT^2 + MDST^2 spectrum,or estimate       */

#endif

    Word16 q_powerSpec[MCT_MAX_CHANNELS],                /* i  : Q for powSpec_fx                           */

    Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i  : same as powerSpec_fx but for inverse spect.*/

    Word16 *q_powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV],  /* i  : Q for powSpecMsInv_fx                      */

lib_com/ivas_rom_com.c

+8 −0
Original line number Diff line number Diff line
@@ -2328,6 +2328,14 @@ const UWord16 ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_S 
 * MASA ROM tables

 *----------------------------------------------------------------------------------*/





#ifdef FIX_1121_MASA_DESCRIPTOR

const UWord8 ivasmasaFormatDescriptor[8] = 

{ 

    0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */

};



#endif

const Word64 diffuseness_reconstructions_hr_fx[HR_MASA_ER_LEVELS] = { /* Q62 */

    0,

    65865144550293504,

lib_com/ivas_rom_com.h

+4 −0
Original line number Diff line number Diff line
@@ -225,6 +225,10 @@ extern const UWord16 ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PAR 
 * MASA ROM tables

 *----------------------------------------------------------------------------------*/



#ifdef FIX_1121_MASA_DESCRIPTOR

extern const UWord8 ivasmasaFormatDescriptor[8]; /* "IVASMASA" */



#endif

extern const Word16 bits_direction_masa[DIRAC_DIFFUSE_LEVELS];

extern const Word16 no_theta_masa[NO_SPHERICAL_GRIDS - 2];

extern const Word16 no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];

lib_com/options.h

+7 −0
Original line number Diff line number Diff line
@@ -115,14 +115,21 @@ 
#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC      /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */

#define NONBE_1894_OSBA_SCALING                          /* FhG: do not scale OSBA inputs by 0.5 any more */

#define NONBE_FIX_1141_OSBA_ROOM_RENDERING               /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */

#define NONBE_1360_LFE_DELAY                           /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_SVD_OPTIMIZATION 

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

#define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */





/* #################### End BASOP porting switches ############################ */