From e66311cb4eb0b48005d4d51b3fb668b7d3142032 Mon Sep 17 00:00:00 2001 From: kiene Date: Mon, 25 Mar 2024 17:34:59 +0100 Subject: [PATCH] fix msan error in TD concealment in MDCT-Stereo --- lib_com/options.h | 1 + lib_dec/er_dec_tcx.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index fda3eb0d4d..8e2afc3490 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -169,6 +169,7 @@ #define NONBE_FIX_1021_ISM_BRIR_RS_FLUSH /* FhG: issue #1021: fix ISM with JBM and RS renderer flushing*/ #define NONBE_FIX_1034_DRY_MASA_RATIOS /* Nokia: Fix issue 1034, use of wrong numDir state. */ +#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB /* FhG: fix bug in TD MDCT-Stereo concealment */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_dec/er_dec_tcx.c b/lib_dec/er_dec_tcx.c index 1aaed8c419..d7ece99b1d 100644 --- a/lib_dec/er_dec_tcx.c +++ b/lib_dec/er_dec_tcx.c @@ -567,7 +567,11 @@ void con_tcx( alpha_inv = 1.0f - alpha_delayed; +#ifdef NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB + a2lsp_stab( A_local, lsp_local, st->lspold_cng ); +#else a2lsp_stab( A_local, lsp_local, lsp_local ); +#endif for ( i = 0; i < M; i++ ) { -- GitLab