Commit dd3ca45a authored by vaclav's avatar vaclav
Browse files

fix FIX_2313_HF_RESET_16KHZ

parent a0051869

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ 
#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */

#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */

#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_2313_HF_RESET_16KHZ                         /* VA: basop issue 2313: Call hf_synth_reset_fx() also for 16 kHz outputs */



/* ##################### 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 );
@@ -2568,7 +2572,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 );
@@ -2618,7 +2626,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 );