diff --git a/lib_com/options.h b/lib_com/options.h index 22375373d46e87311749323dcd78d3380484115d..ad53cf3406f47168ffaac735cdbabe24507b5a08 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -162,6 +162,7 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */ #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_2392_MSAN_DESTROY_DEC /* VA: basop issue 2392: fix MSAN in ivas_destroy_dec_fx() */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index ab00e2d5d17af877cd5ea26bf40634de7cf51ad5..035f6b86be63a917218a0e1addda525f3bd08c58 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -298,6 +298,9 @@ static void init_decoder_config( ) { hDecoderConfig->Opt_AMR_WB = 0; +#ifdef FIX_2392_MSAN_DESTROY_DEC + hDecoderConfig->output_Fs = -1; +#endif hDecoderConfig->nchan_out = 1; hDecoderConfig->output_config = IVAS_AUDIO_CONFIG_INVALID; hDecoderConfig->Opt_LsCustom = 0;