From e6c141728eb944eb3c273d7d54fc1d3ab5c409f5 Mon Sep 17 00:00:00 2001 From: Tommy Vaillancourt Date: Tue, 25 Nov 2025 15:16:57 -0500 Subject: [PATCH 1/2] possible fix to the issue uncovered by FIX_2015_PREMPH_SAT_ALT --- lib_com/options.h | 1 + lib_enc/enc_higher_acelp_fx.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 0f23d8082..56612b1da 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -92,6 +92,7 @@ #define FIX_2176_ASSERT_DEC_MAP_PARAMS_DIRAC2STEREO /* FhG: Reduce hStereoDft->q_smooth_buf_fx by one to prevent overflow in the subframe_band_nrg[][] calculation */ #define FIX_2015_PREMPH_SAT_ALT /* VA: saturation can happen during preemphasis filtering due to a too aggressive scaling factor, allows preemphis to get 1 more bit headroom */ +#define FIX_2015_PREMPH_SAT_ALT_PART2 /* VA: Possible fix to an issue discovered when activating FIX_2015_PREMPH_SAT_ALT */ #define FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE /* Nokia: Fixes float to fx conversion in decoder app with object edit file interface */ #define FIX_2070_JBM_TC_CHANNEL_RESCALING_ISSUE /* Eri/Orange: scale_sig32 problem on p_tc_fx[] */ diff --git a/lib_enc/enc_higher_acelp_fx.c b/lib_enc/enc_higher_acelp_fx.c index db4088ac5..bf0606e82 100644 --- a/lib_enc/enc_higher_acelp_fx.c +++ b/lib_enc/enc_higher_acelp_fx.c @@ -489,9 +489,11 @@ void transf_cdbk_enc_ivas_fx( /*--------------------------------------------------------------* * Split algebraic vector quantizer based on RE8 lattice *--------------------------------------------------------------*/ - +#ifndef FIX_2015_PREMPH_SAT_ALT_PART2 AVQ_cod_fx( x_tran, x_norm, nBits, Nsv, 0 ); - +#else + AVQ_cod_fx( x_tran, x_norm, nBits, Nsv, Qdct ); +#endif /*--------------------------------------------------------------* * Find prequantizer excitation gain * Quantize the gain -- GitLab From 409b1a0307bf8cf013c9b2fd59c698ea0fe7b0e4 Mon Sep 17 00:00:00 2001 From: Tommy Vaillancourt Date: Thu, 27 Nov 2025 12:23:30 -0500 Subject: [PATCH 2/2] add back a switch that disappeared during main merge --- 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 708e7f633..867d83ee0 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -73,7 +73,7 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ #define FIX_1990_SANITIZER_IN_REVERB_LOAD /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */ #define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/ - +#define FIX_2015_PREMPH_SAT_ALT_PART2 /* VA: Add missing scaling factor to be passed to AVQ_cod() */ /* ################### End FIXES switches ########################### */ /* #################### Start BASOP porting switches ############################ */ -- GitLab