From dd3ca45a41516f5d32f65b72c0dcdb576084b7b2 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 9 Jan 2026 17:38:16 +0100 Subject: [PATCH 1/2] fix FIX_2313_HF_RESET_16KHZ --- lib_com/options.h | 1 + lib_dec/core_switching_dec_fx.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index a24403788..95d94587a 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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 ########################### */ diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c index d1040cb80..600f43f3e 100644 --- a/lib_dec/core_switching_dec_fx.c +++ b/lib_dec/core_switching_dec_fx.c @@ -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 ); -- GitLab From 5ef21d56fcad681a561cfcb6b875482894a8bd73 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 9 Jan 2026 18:07:04 +0100 Subject: [PATCH 2/2] comment --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 95d94587a..9b8fdea3d 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -133,7 +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 */ +#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 ########################### */ -- GitLab