Commit 52ab5034 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_I414_OOA_CNA

parent 7b349f84

lib_com/cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -1433,11 +1433,7 @@ typedef enum _DCTTYPE 


#define CNA_MAX_BRATE                       ACELP_13k20



#ifdef FIX_I414_OOA_CNA

#define CNA_INIT_NBANDS                     6

#else

#define MAX_CNA_NBANDS                      12

#endif



#define GAIN_Q_OFFSET_EVS 60.f

#define GAIN_Q_OFFSET_IVAS 45.f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ 
#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



#define FIX_I414_OOA_CNA                                /* VA: Issue 414: Fixing out-of-array write operation in stereo CNA */





#define SNS_MSVQ                                        /* FhG: contribution 33 - MSVQ for SNS parameters at stereo mid bitrates */

lib_dec/fd_cng_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -158,13 +158,8 @@ void initFdCngDec( 
    hFdCngDec->cna_ILD_LT = 0.0f;

    hFdCngDec->first_cna_noise_updated = 0;

    hFdCngDec->first_cna_noise_update_cnt = 0;

#ifdef FIX_I414_OOA_CNA

    hFdCngDec->cna_nbands = CNA_INIT_NBANDS;

    mvs2s( cna_init_bands, hFdCngDec->cna_band_limits, CNA_INIT_NBANDS + 1 );

#else

    hFdCngDec->cna_nbands = 6;

    mvs2s( cna_init_bands, hFdCngDec->cna_band_limits, MAX_CNA_NBANDS + 1 );

#endif

    hFdCngDec->cna_act_fact = 1.0f;

    hFdCngDec->cna_rescale_fact = 0.0f;

    hFdCngDec->cna_seed = 5687;

lib_dec/ivas_rom_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -226,11 +226,7 @@ const float dft_win_8k[70] = 
 * stereo CNA tables

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



#ifdef FIX_I414_OOA_CNA

const int16_t cna_init_bands[CNA_INIT_NBANDS + 1] =

#else

const int16_t cna_init_bands[MAX_CNA_NBANDS + 1] =

#endif

{

    1, 4, 14, 33, 67, 171, 320

};

lib_dec/ivas_rom_dec.h

+0 −4
Original line number Diff line number Diff line
@@ -68,11 +68,7 @@ extern const float dft_win232ms_48k[450]; 


extern const float dft_win_8k[70];



#ifdef FIX_I414_OOA_CNA

extern const int16_t cna_init_bands[CNA_INIT_NBANDS + 1];

#else

extern const int16_t cna_init_bands[MAX_CNA_NBANDS + 1];

#endif



extern const float min_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS];

extern const float max_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS];