From 7df82f847e2efa11478558614884b7b2996d00fa Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 3 Oct 2023 11:01:21 +0200 Subject: [PATCH 1/2] Disable DEBUG_FORCE_MDCT_STEREO_MODE to align with delivered and tested code --- lib_com/options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 3ccf81b46b..eaf86ad865 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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*/ -- GitLab From 69cb5f37378083be0f533ea277454ceaed55d807 Mon Sep 17 00:00:00 2001 From: Eleni Fotopoulou Date: Wed, 4 Oct 2023 11:29:22 +0200 Subject: [PATCH 2/2] [fix] set switch from DEBUGGING to DEBUG_FORCE_MDCT_STEREO_MODE for debugging mdct stereo with forcing a stereo mode --- lib_enc/ivas_stereo_mdct_stereo_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc.c b/lib_enc/ivas_stereo_mdct_stereo_enc.c index d959cdba2f..38e537713d 100755 --- a/lib_enc/ivas_stereo_mdct_stereo_enc.c +++ b/lib_enc/ivas_stereo_mdct_stereo_enc.c @@ -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; -- GitLab