Commit 77307f2d authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '844-mdct-stereo-mode-force-active' into 'main' 

Disable DEBUG_FORCE_MDCT_STEREO_MODE to align with delivered and tested code

See merge request !1133
parents eeee3ca9 01339e05

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
/*#define ALLOW_BYTE_EP*/                       /* allow byte fer pattern files and check fer pattern file validity */

#define WRAP_AS_EIDXOR                          /* wraps  FER file (as in STL_eid-xor.c/softbit.c) */



#define DEBUG_FORCE_MDCT_STEREO_MODE            /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */

/*#define DEBUG_FORCE_MDCT_STEREO_MODE*/        /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */

/*#define DEBUG_STEREO_DFT_NOCORE*/             /* DFT stereo: by-pass core coder at decoder side*/

/*#define DEBUG_STEREO_DFT_NOSTEREO*/           /* DFT stereo: by-pass stereo processing at encoder and decoder side*/

/*#define DEBUG_STEREO_DFT_NOQRES*/

lib_enc/ivas_stereo_mdct_stereo_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void stereo_coder_tcx( 
    }



    if (

#ifdef DEBUGGING

#ifdef DEBUG_FORCE_MDCT_STEREO_MODE

        hStereoMdct->fDualMono ||

#endif

        ( sts[0]->hTcxEnc->transform_type[0] != sts[1]->hTcxEnc->transform_type[0] ) || ( sts[0]->hTcxEnc->transform_type[1] != sts[1]->hTcxEnc->transform_type[1] ) || ( sts[0]->last_core != sts[1]->last_core && ( sts[0]->last_core == ACELP_CORE || sts[1]->last_core == ACELP_CORE ) ) || sts[0]->last_core == ACELP_CORE || sts[1]->last_core == ACELP_CORE )
@@ -324,7 +324,7 @@ void stereo_coder_tcx( 
        pop_wmops();

        return;

    }

#ifdef DEBUGGING

#ifdef DEBUG_FORCE_MDCT_STEREO_MODE

    else if ( hStereoMdct->fMSstereo )

    {

        hStereoMdct->mdct_stereo_mode[0] = SMDCT_MS_FULL;