Commit 8c5a173e authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch... 

Merge branch 'basop-2614-assert-in-stereo_dft_generate_comfort_noise_fx-for-stereo-bitstream-with-dtx-and-bit' into 'main'

[non-BE][split-non-BE][rend-non-BE] Resolve "Assert in stereo_dft_generate_comfort_noise_fx() for stereo bitstream with dtx and bit rate switching"

Closes #2614

See merge request !3059
parents f08d96c0 46331437

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ 
#define FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT   /* FhG: BASOP #2621: stereo_dft_generate_comfort_noise_fx flag_noisy_speech: compare (lp_speech-lp_noise) Q23 diff against 28.0 in Q23 (was vs integer 28 with q_lp_noise=0) */

#define FIX_ISSUE_2618_PLC_RES_ATT_SCALING              /* FhG: BASOP #2618: residual PLC burst attenuation, apply divide/Sqrt32 exponent so fac tracks exponent correctly */



#define NONBE_FIX2614_LP_CNG_ASSERT



/* ##################### End NON-BE switches ########################### */



/* ################## End MAINTENANCE switches ######################### */

lib_dec/ivas_stereo_cng_dec_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -345,6 +345,9 @@ static void stereo_dft_generate_comfort_noise_fx( 
        {

            q_cngNoiseLevel_upd = s_min( q_cngNoiseLevel_upd, add( e_norm_temp[i], norm_l( cngNoiseLevel_upd[i] ) ) );

        }

#ifdef NONBE_FIX2614_LP_CNG_ASSERT

        q_cngNoiseLevel_upd = s_min( q_cngNoiseLevel_upd, sub( 31, shr( st->hFdCngDec->bandNoiseShape_exp, 1 ) ) );

#endif

        FOR( i = 0; i < st->L_frame; i++ )

        {

            cngNoiseLevel_upd[i] = L_shl( cngNoiseLevel_upd[i], sub( q_cngNoiseLevel_upd, e_norm_temp[i] ) );