Commit a9137345 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_1203_MDCT2DFT_SWITCHING

parent 9dc0a976

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ 
#define NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX      /* Ericsson: Issue 1246: High level input which triggers DTX can lead to numerical overflow in coherence calculation */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */

#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_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */

#define FIX_1376_MISSING_ISM_METADATA                   /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

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++ )