Commit 3ce9f057 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2

parent bc0eac0f

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_SWB_fenv_fx2 /* FhG: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

#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 */

lib_enc/swb_bwe_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -2243,12 +2243,8 @@ static Word16 SWB_BWE_encoding_fx( 
                L_tmp = Mpy_32_16( exp, tmp, 24660 ); /* Q14 */ /*10log10(2) in Q13 */

                tmp = round_fx( L_shl( L_tmp, 10 ) );           /* Q8 */



#ifdef NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2

                /* For very small energies, log10 in Q8 smaller than -128.0, saturation can occur here. */

                SWB_fenv_fx[n_band] = sub_sat( tmp, Mean_env_tr_fx[n_band] );

#else

                SWB_fenv_fx[n_band] = sub( tmp, Mean_env_tr_fx[n_band] );

#endif

                move16(); /*Q8 */

            }

        }
@@ -2593,12 +2589,8 @@ static Word16 SWB_BWE_encoding_fx( 


        FOR( n_band = 0; n_band < SWB_FENV; n_band++ )

        {

#ifdef NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2

            /* For very small energies, log10 in Q8 smaller than -128.0, saturation can occur here. */

            SWB_fenv_fx[n_band] = sub_sat( SWB_fenv_fx[n_band], Mean_env_fx[n_band] );

#else

            SWB_fenv_fx[n_band] = sub( SWB_fenv_fx[n_band], Mean_env_fx[n_band] );

#endif

            move16();

        }