Commit 7179baef authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_MDCT_ST_PLC_FADEOUT_DELAY

parent f2308d39

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -869,9 +869,7 @@ enum fea_names 
#define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG       0.001f

#define MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME      2 * FRAMES_PER_SEC

#define MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN         20

#ifdef FIX_MDCT_ST_PLC_FADEOUT_DELAY

#define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE    3

#endif



typedef enum {

    EQUAL_CORES,

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 


/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/



#define FIX_MDCT_ST_PLC_FADEOUT_DELAY

#define FIX_DIRAC_LS_SYNTHESIS_CONFIG_479               /* FhG: fix for issue 479, broken LS output with DirAC at high BRs */

#define HYBRID_ITD_MAX                                 /* FhG: Improvement for DFT-stereo for cases with large ITDs */

#define FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR             /* Eri: Fix for issue 462: Use-of-uninitialized memory in external HRTF deallocation in decoder together with BR switching */

lib_dec/er_dec_tcx.c

+0 −12
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ void con_tcx( 


    if ( A_cng != NULL )

    {

#ifdef FIX_MDCT_ST_PLC_FADEOUT_DELAY

        float alpha_delayed;



        alpha_delayed = 1.0f;
@@ -563,27 +562,16 @@ void con_tcx( 
        }



        if ( st->plcBackgroundNoiseUpdated && alpha_delayed != 1.0f )

#else

        if ( st->plcBackgroundNoiseUpdated && alpha != 1.0f )

#endif

        {

            float lsp_local[M], lsp_fade[M], alpha_inv;



#ifdef FIX_MDCT_ST_PLC_FADEOUT_DELAY

            alpha_inv = 1.0f - alpha_delayed;

#else

            alpha_inv = 1.0f - alpha;

#endif



            a2lsp_stab( A_local, lsp_local, lsp_local );



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

            {

#ifdef FIX_MDCT_ST_PLC_FADEOUT_DELAY

                lsp_fade[i] = alpha_delayed * lsp_local[i] + alpha_inv * st->lspold_cng[i];

#else

                lsp_fade[i] = alpha * lsp_local[i] + alpha_inv * st->lspold_cng[i];

#endif

            }



            lsp2a_stab( lsp_fade, A_local, M );