diff --git a/lib_com/options.h b/lib_com/options.h index 2f468a0103cf461a087a99ff839532ec719af75b..3e87df4e8d499c8bcc57d0cc853239964a1f4c9c 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -86,12 +86,14 @@ #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */ #define FIX_1435_MOVE_STEREO_PANNING /* VA: issue 1435: do the EVS stereo panning in the renderer */ + /* #################### End BE switches ################################## */ /* #################### Start NON-BE switches ############################ */ /* any switch which is non-be wrt. TS 26.251 V3.0 */ #define FIX_1454_FIX_STEREO_TO_FOA_JBM /* VA: issue 1454: fix buggy stereo to FOA in JBM */ +#define FIX_2015_PREMPH_SAT_ALT_PART2 /* VA: Add missing scaling factor to be passed to AVQ_cod() */ diff --git a/lib_enc/enc_higher_acelp_fx.c b/lib_enc/enc_higher_acelp_fx.c index db4088ac581970a4b9af79fce9355fbfb13424e3..455fc03229f66888bc00c416d4cebd1dccf3f092 100644 --- a/lib_enc/enc_higher_acelp_fx.c +++ b/lib_enc/enc_higher_acelp_fx.c @@ -490,7 +490,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