Commit 57e7b6c3 authored by Jan Kiene's avatar Jan Kiene Committed by emerit
Browse files

fix msan error in TD concealment in MDCT-Stereo

parent 8a3560ac
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -167,12 +167,9 @@
/* any switch which is non-be wrt selection floating point code */
/* all switches in this category should start with "NONBE_" */

#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */
#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define NON_BE_FIX_1048_THRESHOLD_COH_BASOP             /* Nokia: Fix 1048 replace comparison with 0 with comparison to threshold, to align with BASOP*/
#define  NONBE_FIX_1054_NEGATIVE_LVQ_INDEX              /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */
#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 ########################### */

+4 −0
Original line number Diff line number Diff line
@@ -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++ )
            {