From 1fba2414a3212df0de4615c39c0cd09b3c63ddc2 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Thu, 26 Mar 2026 13:44:00 +0100 Subject: [PATCH 1/2] remove obsolete code for dft stereo in fd-bwe --- lib_com/options.h | 1 + lib_enc/swb_bwe_enc.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index bbea3aa15..0f2ee7f13 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -161,6 +161,7 @@ /*#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*/ /* #################### End BE switches ################################## */ diff --git a/lib_enc/swb_bwe_enc.c b/lib_enc/swb_bwe_enc.c index 6fb4fa2f4..382e5f26c 100644 --- a/lib_enc/swb_bwe_enc.c +++ b/lib_enc/swb_bwe_enc.c @@ -548,7 +548,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 +576,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 } } -- GitLab From 5ec9a6afb7750a3cdc868aeae3085ba0b511431e Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Thu, 26 Mar 2026 17:07:43 +0100 Subject: [PATCH 2/2] remove TBE handle as it is not used anymore --- lib_enc/swb_bwe_enc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib_enc/swb_bwe_enc.c b/lib_enc/swb_bwe_enc.c index 382e5f26c..4e74fa10b 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; -- GitLab