From 840ff55c9efeb7f5b2d5fdc8e0ea31e5fc0306bf Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 17 Jun 2026 09:40:10 +0200 Subject: [PATCH] [cleanup] accept FIX_BASOP_2612_RESET_DECIM_MEM --- lib_com/options.h | 1 - lib_enc/ivas_stereo_switching_enc.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 8c46419b8..a33f3986f 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -170,7 +170,6 @@ /* any switch which is non-be wrt. TS 26.258 V3.0 */ #define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */ -#define FIX_BASOP_2612_RESET_DECIM_MEM /* FhG: BASOP #2612: reset (zero) the 16k resampler memory of the secondary channel on DFT->TD stereo switch (otherwise -> fx overshoot) */ #define FIX_FLOAT_1600_OMASA_WRONG_RENDER_PATH /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc.c index c42ee23ab..1910dfd06 100644 --- a/lib_enc/ivas_stereo_switching_enc.c +++ b/lib_enc/ivas_stereo_switching_enc.c @@ -755,9 +755,7 @@ void stereo_switching_enc( /* no secondary channel in the previous frame -> memory resets */ set_zero( sts[1]->old_inp_12k8, L_INP_MEM ); -#ifdef FIX_BASOP_2612_RESET_DECIM_MEM set_zero( sts[1]->mem_decim16k, 2 * L_FILT_MAX ); -#endif set_zero( sts[1]->mem_decim, 2 * L_FILT_MAX ); sts[1]->mem_preemph = 0; -- GitLab