Commit e40623cf authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'basop-2612-assert-in-ivas_compute_core_buffers_fx-of-basop-encoder-v2' into 'main' 

Resolve "Assert in ivas_compute_core_buffers_fx of BASOP encoder" v2

See merge request !3064
parents 5440e481 9daa34a9

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,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: Increase accuracy of computations and add additional gain clamp for low energy decorrelated signal rendering. */

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



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_stereo_switching_enc_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -853,6 +853,9 @@ void stereo_switching_enc_fx( 


        /* no secondary channel in the previous frame -> memory resets */

        set16_fx( sts[1]->old_inp_12k8_fx, 0, L_INP_MEM );

#ifdef FIX_BASOP_2612_RESET_DECIM_MEM

        set16_fx( sts[1]->mem_decim16k_fx, 0, 2 * L_FILT_MAX );

#endif

        set16_fx( sts[1]->mem_decim_fx, 0, 2 * L_FILT_MAX );

        sts[1]->q_mem_decim_fx = Q15;

        move16();