Commit ef47b1ef authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2315-agc-memory-reset-missing-in-sce-coding' into 'main' 

[non-BE] Resolve "AGC memory reset missing in SCE coding"

See merge request !2701
parents 3240a5ad 516d64b7

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 
#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */

#define FIX_2257_INCR_GUARD_BITS                        /* FhG: take correct rendering frame-size into account for guard-bits calculation */

#define FIX_2297_SBA_SCALING_32KHZ                      /* VA: basop issue 2297: Fix scaling factor before the SBA decoder for output_Fs = 32 or 16 */

#define FIX_2315_AGC_MEMORY_RESET                       /* VA: basop issue 2315: fix reset of the AGC memory */



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

lib_dec/core_switching_dec_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -2491,8 +2491,14 @@ ivas_error core_switching_pre_dec_ivas_fx( 
            /* Last frame was Stereo CNG and the synthesis memory is outdated -- reset */

            set16_fx( st->hTcxDec->old_syn_Overl, 0, L_FRAME32k / 2 );

            set16_fx( st->hFdCngDec->hFdCngCom->olapBufferAna_fx, 0, FFTLEN );

#ifndef FIX_2315_AGC_MEMORY_RESET

            set16_fx( st->agc_mem_fx, 0, 2 );

#endif

        }



#ifdef FIX_2315_AGC_MEMORY_RESET

        set16_fx( st->agc_mem_fx, 0, 2 );

#endif

        st->mem_deemph_fx = 0;

        move16();

        IF( !st->last_con_tcx )