Commit 68926127 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 425-masa-bitrate-switching-not-reconfiguring-renderer
parents 304ebdfa 009b76be

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ complexity-ism-in-binaural-out: 
    - *complexity-measurements-setup

    - in_format=ISM

    - out_format=BINAURAL

    - bash ci/complexity_measurements/getWmops.sh "ISM1 ISM2 ISM3 ISM4" "$out_format"

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"

    - *complexity-measurements-prepare-artifacts



complexity-sba-hoa3-in-hoa3-out:

lib_com/cnst.h

+6 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,12 @@ typedef enum _DCTTYPE 
#define CHEAP_NORM_SIZE                     161



#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

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ 
#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

#define FIX_419_ISM_MD_FIX                              /* VA: Issue 419: fix the upper value limitation for parameter angle1_diff_cnt */

#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

+5 −0
Original line number Diff line number Diff line
@@ -158,8 +158,13 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -226,7 +226,11 @@ 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

};