Commit 7f87eaef authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '334-dft-td-stereo-selection-affected-by-debugging-define-on-off' into 'main' 

[non-BE]Resolve "DFT/TD stereo selection affected by DEBUGGING define on/off"

See merge request !431
parents b68eaab5 d3760b79

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
#define FIX_337_TDREND_INTP                             /* Issue 337: TD renderer interpolation threshold set too low */



#define FIX_310_TD_REND_DELAY                           /* Adding HRTF delay being read from ROM/Binary file, fix rounding for delay compensation in renderer */

#define FIX_334_DEBUG_BE_STEREO_SWITCHING               /* FhG: Fix non-BE issue for stereo switching when DEBUGGING is enabled */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_enc/ivas_cpe_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -315,7 +315,11 @@ ivas_error ivas_cpe_enc( 
        if ( hCPE->element_brate != hCPE->last_element_brate && st_ivas->hMCT == NULL )

        {

#ifdef DEBUGGING

#ifndef FIX_334_DEBUG_BE_STEREO_SWITCHING

            hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->stereo_mode_cmdl;

#else

            hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->mdct_stereo_mode_cmdl;

#endif

#endif

            initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, max_bwidth, 0, NULL, 0 );

            hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );