Commit f61e4cda authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_I13_TCX_TNS_ISSUE

parent 5e197880

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

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



#define FIX_I13_TCX_TNS_ISSUE                           /* Issue 13: Fix reported artifacts. Bug in TNS with TCX5 */

#define FIX_TCX10_STEREO_PROC                           /* Issue 11 */

#define CORECODER_BITRATE_SWITCHING                     /* Issue 133: support bitrate switching in core-coder */

#define ISM_BITRATE_SWITCHING                           /* Issue 115: Support for Bitrate Switching in ISM */

lib_dec/dec_tcx.c

+0 −12
Original line number Diff line number Diff line
@@ -1465,12 +1465,6 @@ void decoder_tcx_tns( 
            isTCX5 = 1;



            tcx5SpectrumDeinterleaving( L >> 1, x );

#ifndef FIX_I13_TCX_TNS_ISSUE

            if ( hTcxCfg->fIsTNSAllowed && fUseTns != 0 && bfi != 1 && tnsData->tnsOnWhitenedSpectra == whitenedDomain )

            {

                tcx5TnsGrouping( L >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x );

            }

#endif

        }

    }
@@ -1488,12 +1482,10 @@ void decoder_tcx_tns( 
        /* Apply TNS to get the reconstructed signal */

        SetTnsConfig( hTcxCfg, L_frame_glob == st->L_frame, ( st->last_core == ACELP_CORE ) && ( frame_cnt == 0 ) );



#ifdef FIX_I13_TCX_TNS_ISSUE

        if ( ( L_frame == st->L_frame >> 1 ) && st->tcxonly && isTCX5 )

        {

            tcx5TnsGrouping( L >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x );

        }

#endif



        ApplyTnsFilter( hTcxCfg->pCurrentTnsConfig, tnsData, x, 0 );

#ifdef DEBUG_PLOT
@@ -1502,9 +1494,6 @@ void decoder_tcx_tns( 


        if ( ( L_frame == st->L_frame >> 1 ) && st->tcxonly && isTCX5 )

        {

#ifndef FIX_I13_TCX_TNS_ISSUE

            tcx5TnsUngrouping( L_frameTCX >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x, DEC );

#else

            if ( st->element_mode == EVS_MONO || L_spec < L_frameTCX ) /* TBC: this is temporary to maintain EVS BE, this is a bug and should be fixed also for EVS (see issue 13) */

            {

                tcx5TnsUngrouping( L_frameTCX >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x, DEC );
@@ -1513,7 +1502,6 @@ void decoder_tcx_tns( 
            {

                tcx5TnsUngrouping( L >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x, DEC );

            }

#endif

        }

    }