Commit 9cee7a66 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_MDCT_KERNEL_RATE_SWITCHING_PLC

parent c52f5870

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 
/*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/            /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define FIX_MDCT_KERNEL_RATE_SWITCHING_PLC              /* force kernel that can handle ACELP -> TCX transition frame lengths for transition frames in decoder */

#define FIX_SBA_CLEAN_UP_OPT                            /* Fix for tickets #6, #10, #17 and #20 */

#define FIX_28_SBA_LS_RENDER                            /* FhG: fix for discontinuities in SBA LS renderer */

lib_dec/ivas_mdct_core_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -846,11 +846,7 @@ void ivas_mdct_core_reconstruct( 
                {

                    decoder_tcx_imdct( st, L_frame_global[ch], L_frame_globalTCX[ch], L_spec[ch], tcx_offset[ch],

                                       tcx_offsetFB[ch], L_frame[ch], L_frameTCX[ch], left_rect[ch], &x[ch][k][0], xn_buf,

#ifdef FIX_MDCT_KERNEL_RATE_SWITCHING_PLC

                                       (( hCPE->nchan_out == 1 && st->hTcxDec->kernel_type[k] == MDST_IV ) || st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ? MDCT_IV : st->hTcxDec->kernel_type[k],

#else

                                       ( hCPE->nchan_out == 1 && st->hTcxDec->kernel_type[k] == MDST_IV ) ? MDCT_IV : st->hTcxDec->kernel_type[k],

#endif

                                       fUseTns[ch][k], &synth[k * L_frame[ch]], &synthFB[k * L_frameTCX[ch]], bfi, k, isLFE, 0 );

                }

                else