Commit 5021e4db authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2313-missing-hf-synth-reset-for-output-at-16-khz' into 'main' 

[non-BE] Resolve "Missing HF synth reset for output at 16 kHz"

See merge request !2696
parents 3c63896c dc8ae241

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 
#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 */

#define FIX_2312_CONDITION_MISSING_GSC_DEC_LR           /* VA: basop issue 2297: addition of condition missing in the GSC gain decoder at low-rate */

#define FIX_2313_HF_RESET_16KHZ                         /* VA: basop issue 2313: Call hf_synth_reset_fx() also for 16 kHz output_Fs */



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

lib_dec/core_switching_dec_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -2246,7 +2246,11 @@ ivas_error core_switching_pre_dec_ivas_fx( 
        move16();



        test();

#ifdef FIX_2313_HF_RESET_16KHZ

        IF( GE_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#else

        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#endif

        {

            hf_synth_reset_fx( st->hBWE_zero );

            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
@@ -2574,7 +2578,11 @@ ivas_error core_switching_pre_dec_ivas_fx( 
        }



        test();

#ifdef FIX_2313_HF_RESET_16KHZ

        IF( GE_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#else

        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#endif

        {

            hf_synth_reset_fx( st->hBWE_zero );

            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );
@@ -2624,7 +2632,11 @@ ivas_error core_switching_pre_dec_ivas_fx( 
        move16();



        test();

#ifdef FIX_2313_HF_RESET_16KHZ

        IF( GE_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#else

        IF( GT_32( st->output_Fs, 16000 ) && st->hBWE_zero != NULL )

#endif

        {

            hf_synth_reset_fx( st->hBWE_zero );

            set16_fx( st->hBWE_zero->mem_hp400_fx, 0, 6 );