diff --git a/lib_com/options.h b/lib_com/options.h index b7d48181a2e35289f988e1fc74899de22fccce41..fb59113de2ca47af68634904f029d35b0a4e2921 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -162,6 +162,7 @@ #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_BASOP_2469_OBJ_EDIT_TD_REND_GAIN /* Eri: Basop issue 2469: TD renderer gain has wrong Q. In float this is just a synch of the cleanup done in BASOP */ +#define FIX_ISSUE_1546_DEAD_CODE /* FhG: remove dead code reported in the issue*/ /* #################### End BE switches ################################## */ diff --git a/lib_enc/swb_bwe_enc.c b/lib_enc/swb_bwe_enc.c index 6fb4fa2f45c34069b96ff6bf5b0e6842256b795a..4e74fa10ba0a16fdb29d8840ea4612e33b41e13d 100644 --- a/lib_enc/swb_bwe_enc.c +++ b/lib_enc/swb_bwe_enc.c @@ -493,7 +493,9 @@ 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; @@ -507,7 +509,9 @@ 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; @@ -548,7 +552,9 @@ 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 } } @@ -574,7 +580,9 @@ 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 } }