Commit 5af41e36 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'fhg/fix-bug-in-td-concealment-for-mdct-stereo' into 'main' 

[NON-BE] Fix msan error in TD concealment in MDCT-Stereo

See merge request !1477
parents 51c71ef0 d3b94470

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB     /* FhG: fix bug in TD MDCT-Stereo concealment */

#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */

#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */

#define NON_BE_1055_RESET_LP_MEMORIES                   /* VA: issue 1055: Correctly reset LP filter MA and AR memories in bitrate switching */

lib_dec/er_dec_tcx.c

+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++ )

            {