Commit 98f07aec authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into float-1600-masa-part-rendering-of-omasa-does-not-always-follow-correct-path-in-internal-renderer
parents 63563462 5696573d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
#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_2442_MASA2TC_TO_MONO_AND_AMBI         /* Nokia: BASOP issue 2442: Aligns float with identical diffuse gain limitation to minimize diff */

#define FIX_FMSW_DEC_EXT                                /* float issue 1566: fix EXT output in format switching */

#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 ########################### */

lib_enc/ivas_stereo_switching_enc.c

+3 −0
Original line number Diff line number Diff line
@@ -755,6 +755,9 @@ 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;