Commit 43530d57 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISSUE_1546_DEAD_CODE

parent ca9facae

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#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 FIX_ISSUE_1546_DEAD_CODE                        /* FhG: remove dead code reported in the issue*/

#define FIX_FLOAT_1544_SBA_META_IMPRECISION_UNSAFE_MATH /* FhG: float issue 1544: imprecision in ivas_get_dirac_sba_max_md_bits() with -funsafe-math-optimizations */

#define FIX_FLOAT_1544_ITD_IMPRECISION_UNSAFE_MATH      /* FhG: float issue 1544: Avoid assert() with -funsafe-math-optimizations in stereo_td_itd() */

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

lib_enc/swb_bwe_enc.c

+0 −12
Original line number Diff line number Diff line
@@ -493,9 +493,6 @@ void swb_bwe_enc( 
)

{

    int16_t i, inner_frame, idxGain;

#ifndef FIX_ISSUE_1546_DEAD_CODE

    TD_BWE_ENC_HANDLE hBWE_TD;

#endif

    FD_BWE_ENC_HANDLE hBWE_FD;

    float *new_input;

    int32_t inner_Fs;
@@ -509,9 +506,6 @@ void swb_bwe_enc( 
    float ener_low, energy_fbe_fb, fb_ener_adjust, ener_adjust_quan;

    int16_t fb_band_begin;



#ifndef FIX_ISSUE_1546_DEAD_CODE

    hBWE_TD = st->hBWE_TD;

#endif

    hBWE_FD = st->hBWE_FD;



    ener_adjust_quan = 0.0f;
@@ -552,9 +546,6 @@ void swb_bwe_enc( 
            if ( st->element_mode == IVAS_CPE_DFT )

            {

                mvr2r( old_input_12k8 + L_INP_MEM - Sample_Delay_LP, hBWE_FD->old_input_lp, Sample_Delay_LP );

#ifndef FIX_ISSUE_1546_DEAD_CODE

                mvr2r( hBWE_TD->old_speech_shb + L_LOOK_16k + L_SUBFR16k - Sample_Delay_HP, new_input_hp, Sample_Delay_HP );

#endif

            }

        }
@@ -580,9 +571,6 @@ void swb_bwe_enc( 
            if ( st->element_mode == IVAS_CPE_DFT )

            {

                mvr2r( old_input_16k + L_INP_MEM - Sample_Delay_LP, hBWE_FD->old_input_lp, Sample_Delay_LP );

#ifndef FIX_ISSUE_1546_DEAD_CODE

                mvr2r( hBWE_TD->old_speech_shb + L_LOOK_16k + L_SUBFR16k - Sample_Delay_HP, new_input_hp, Sample_Delay_HP );

#endif

            }

        }