Commit 1cf94238 authored by multrus's avatar multrus
Browse files

Merge branch '20260617_cleanup' into 'main'

Cleanup 2026-06-17

See merge request !2654
parents e4428064 840ff55c
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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 ########################### */
+0 −2
Original line number Diff line number Diff line
@@ -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;