Commit 37bf5da7 authored by Jan Kiene's avatar Jan Kiene
Browse files

acceptFADE_TO_ZERO_FOR_TOO_LONG_FRAMELOSS

parent 46fc3b2b

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -796,10 +796,8 @@ enum fea_names 
#define SNS_NPTS                                16 /* Number of downsampled SNS parameters */



#define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG       0.001f

#ifdef FADE_TO_ZERO_FOR_TOO_LONG_FRAMELOSS

#define MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME      2 * FRAMES_PER_SEC

#define MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN         20

#endif



typedef enum {

    EQUAL_CORES,

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ 
#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FADE_TO_ZERO_FOR_TOO_LONG_FRAMELOSS

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

lib_dec/dec_tcx.c

+0 −2
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ void decoder_tcx_post( 
        if ( st->tcxonly )

        {

            gainCNG = hTcxDec->CngLevelBackgroundTrace_bfi / ( level_syn + 0.01f );

#ifdef FADE_TO_ZERO_FOR_TOO_LONG_FRAMELOSS



            if ( st->element_mode == IVAS_CPE_MDCT && !isMCT )

            {
@@ -205,7 +204,6 @@ void decoder_tcx_post( 
                    gainCNG *= 1.f - (float) ( st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME ) / MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN;

                }

            }

#endif

        }

        else

        {

lib_dec/er_dec_tcx.c

+0 −2
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ void con_tcx( 
    {

        gainCNG = hTcxDec->CngLevelBackgroundTrace_bfi / gainSynthDeemph;



#ifdef FADE_TO_ZERO_FOR_TOO_LONG_FRAMELOSS

        if ( st->element_mode == IVAS_CPE_MDCT && A_cng != NULL )

        {

            if ( st->nbLostCmpt > MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME + MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN )
@@ -459,7 +458,6 @@ void con_tcx( 
                gainCNG *= 1.f - (float) ( st->nbLostCmpt - MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME ) / MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN;

            }

        }

#endif

    }

    else

    {