Commit 63daa8f5 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx

parent 3ce9f057

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define HARMONIZE_2595_reconfig_decoder_LPD             /* FhG: Harmonize reconfig_decoder_LPD with its ivas derivate */

lib_enc/swb_bwe_enc_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -1290,12 +1290,7 @@ static void MSVQ_Interpol_Tran_fx( 
        FOR( n_band = 0; n_band < DIM_TR2 - 1; n_band++ )

        {

            /*quant_tmp2[n_band] = env_temp12[n_band] - ((quant_tmp[n_band]+quant_tmp[n_band+1])/2.f); */

#ifdef NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx

            tmp = add( shr( quant_tmp[n_band], 1 ), shr( quant_tmp[n_band + 1], 1 ) ); /*Q8 */

#else

            tmp = add( quant_tmp[n_band], quant_tmp[n_band + 1] ); /*Q8 */

            tmp = shr( tmp, 1 );

#endif

            quant_tmp2[n_band] = sub( env_temp12[n_band], tmp );

            move16(); /*Q8 */

        }
@@ -1314,12 +1309,7 @@ static void MSVQ_Interpol_Tran_fx( 
        FOR( n_band = 0; n_band < DIM_TR2 - 1; n_band++ )

        {

            /*quant_select[n_band*2+1] = ((quant_tmp[n_band]+quant_tmp[n_band+1])/2.f) + quant_tmp2[n_band]; */

#ifdef NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx

            tmp = add( shr( quant_tmp[n_band], 1 ), shr( quant_tmp[n_band + 1], 1 ) ); /*Q8 */

#else

            tmp = add( quant_tmp[n_band], quant_tmp[n_band + 1] ); /*Q8 */

            tmp = shr( tmp, 1 );

#endif

            quant_select[n_band * 2 + 1] = add( tmp, quant_tmp2[n_band] );

            move16();

        }