Commit 44353713 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX2614_LP_CNG_ASSERT

parent 2483db0a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define NONBE_FIX2614_LP_CNG_ASSERT                     /* FhG: */

#define FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH          /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */

#define FIX_BASOP_1765_MASA1TC_CNG_MISMATCH             /* Nokia: BASOP issue 1765: Improve accuracy of FD CNG noise estimation */

#define FIX_BASOP_2627_PARAM_MC_ILD_REMAP_EXP           /* FhG: BASOP #2627: accumulate 10^(ILD/10) using a dynamic exponent */

lib_dec/ivas_stereo_cng_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -345,9 +345,7 @@ 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] ) );