Commit 5522d6c1 authored by multrus's avatar multrus
Browse files

Merge branch '1634_ref_port_fl1477' into 'ivas-float-update' 

Port MR 1477 into float-pc

See merge request !1710
parents 78ce31d4 506814e1

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ 
#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define FIX_970_USAN_IN_NELP_SEED

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

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



#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

/* #################### End BASOP porting switches ############################ */

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

            {