Commit 0448c72e authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1634_basop_port_fl1477' into 'main' 

Port MR 1477 into main-pc

See merge request !1709
parents 24a91cb5 c36b71d9

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#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 */



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

lib_dec/er_dec_tcx_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1766,7 +1766,11 @@ void con_tcx_ivas_fx( 


            alpha_inv = sub( 16384 /*Q.0f in Q14*/, alpha_delayed ); /*Q14*/



#ifdef NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB

            E_LPC_a_lsp_conversion( A_local, lsp_local, st->lspold_cng, M );

#else

            E_LPC_a_lsp_conversion( A_local, lsp_local, lsp_local, M );

#endif



            FOR( i = 0; i < M; i++ )

            {