Commit d97ec9ca authored by vaclav's avatar vaclav
Browse files

Merge branch '1203-switching-artifact-in-mdct-dft-stereo-switching' into 'main' 

[non-BE] Resolve "Switching artifact in MDCT -> DFT stereo switching"

See merge request !1861
parents fb97bf17 040d034e

lib_com/options.h

+1 −8
Original line number Diff line number Diff line
@@ -161,10 +161,7 @@ 
/* only BE switches wrt selection floating point code */



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



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





#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */
@@ -172,18 +169,14 @@ 


/* #################### Start NON-BE switches ############################ */





/* any switch which is non-be wrt selection floating point code */

/* 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_FIX_1212_TONAL_MDCT_CONCEALMENT           /* FhG: Fix issue 1212, zero IGF spec also in 1st concealed frame */





#define NONBE_1200_ISM_JBM_BRATE_SW_FLUSH               /* VA: issue 1200: fix bug in renderer flush in ISM JBM bitrate switching */

#define NONBE_FIX_1205_TD_STEREO_MOD_CT                 /* VA: fix mismatch of coder_type (mod_ct) btw. TD stereo encoder and decoder */

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





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

lib_enc/ivas_stereo_dft_td_itd.c

+14 −0
Original line number Diff line number Diff line
@@ -399,6 +399,9 @@ 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 )

    {
@@ -427,6 +430,17 @@ 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;



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

        {

            mvr2r( hCPE->hCoreCoder[i]->input + input_frame - dft_ovl, hCPE->input_mem[i], dft_ovl );

        }

    }

#endif



    return;

}

lib_enc/ivas_stereo_switching_enc.c

+3 −0
Original line number Diff line number Diff line
@@ -625,6 +625,9 @@ 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++ )