Commit c21ac393 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1203_MDCT2DFT_SWITCHING

parent e0e156c9

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1203_MDCT2DFT_SWITCHING                   /* VA: issue 1203: fix severe artifacts during MDCT to DFT stereo switching when MDCT ITD is not used */

#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_stereo_dft_td_itd.c

+0 −4
Original line number Diff line number Diff line
@@ -399,9 +399,7 @@ void stereo_td_itd_mdct_stereo( 
    float bin_nrgR[STEREO_DFT_N_32k_ENC];

    float DFT[CPE_CHANNELS][STEREO_DFT_N_MAX_ENC];

    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct;

#ifdef NONBE_1203_MDCT2DFT_SWITCHING

    int16_t dft_ovl;

#endif



    if ( hCPE->hStereoMdct != NULL && hCPE->hStereoMdct->hItd != NULL )

    {
@@ -430,7 +428,6 @@ void stereo_td_itd_mdct_stereo( 
        stereo_td_itd( hStereoMdct->hItd, NULL, 1, hStereoMdct->hDft_ana->dft_ovl, hCPE->hCoreCoder, input_frame, hCPE->input_mem );

#endif

    }

#ifdef NONBE_1203_MDCT2DFT_SWITCHING

    else if ( hCPE->input_mem[0] != NULL )

    {

        dft_ovl = STEREO_DFT_OVL_MAX * input_frame / L_FRAME48k;
@@ -440,7 +437,6 @@ void stereo_td_itd_mdct_stereo( 
            mvr2r( hCPE->hCoreCoder[i]->input + input_frame - dft_ovl, hCPE->input_mem[i], dft_ovl );

        }

    }

#endif



    return;

}

lib_enc/ivas_stereo_switching_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -625,9 +625,7 @@ void stereo_switching_enc( 
    dft_ovl = STEREO_DFT_OVL_MAX * input_frame / L_FRAME48k;



    /* update DFT analysis overlap memory */

#ifdef NONBE_1203_MDCT2DFT_SWITCHING

    /* note: in MDCT stereo, the update is done in stereo_td_itd_mdct_stereo() */

#endif

    if ( hCPE->element_mode > IVAS_CPE_DFT && hCPE->input_mem[0] != NULL && hCPE->element_mode != IVAS_CPE_MDCT )

    {

        for ( n = 0; n < CPE_CHANNELS; n++ )