From 3ee74b5322bb8f113855b87c6f30097bf209c6f3 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 19 Apr 2023 09:41:24 +0200 Subject: [PATCH 1/3] encapsulate rendering debugging options with DEBUGGING; under REND_DEBUGGING_REVISION --- lib_com/options.h | 2 ++ lib_dec/ivas_dec.c | 8 ++++++++ lib_dec/ivas_output_config.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index c188222e22..d4da9f8b50 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -171,6 +171,8 @@ #define FIX_401_DIRAC_RENDERER_META_READ_INDICES /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */ +#define REND_DEBUGGING_REVISION /* VA: encapsulate rendering debugging options with DEBUGGING */ + /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ #endif diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index b4eb783624..e84825afe6 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -266,7 +266,15 @@ ivas_error ivas_dec( /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */ ivas_ism_render( st_ivas, output, output_frame ); } +#ifdef REND_DEBUGGING_REVISION +#ifdef DEBUGGINGaa else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) +#else + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) +#endif +#else + else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) +#endif { /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */ #ifdef NCHAN_ISM_PARAMETER diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c index f522a3217d..c005e95fab 100644 --- a/lib_dec/ivas_output_config.c +++ b/lib_dec/ivas_output_config.c @@ -114,7 +114,7 @@ void ivas_renderer_select( else { *renderer_type = RENDERER_BINAURAL_MIXER_CONV_ROOM; -#if defined( DEBUGGING ) +#ifdef DEBUGGING if ( st_ivas->hRenderConfig->renderer_type_override == RENDER_TYPE_OVERRIDE_FASTCONV ) { *renderer_type = RENDERER_BINAURAL_FASTCONV_ROOM; -- GitLab From dfd142cf820a172cffb96ba3a82ef0caf6ce9a71 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 19 Apr 2023 09:42:53 +0200 Subject: [PATCH 2/3] remove empty lines --- lib_com/options.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index d4da9f8b50..7eaa0029da 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -151,12 +151,10 @@ #define FIX_382_MASA_META_FRAMING_ASYNC /* Nokia: Issue 382: detect potential MASA metadata framing offset */ #define FIX_386_CORECODER_RECONFIG /* VA: Issue 386: Resolve ToDo comments in CoreCoder reconfig. */ - #define SBA2MONO /* FhG: Issue 365: Adapt processing of SBA mono output to be in line with stereo output (less delay, lower complexity) */ #define FIX_379_EXT_METADATA /* Eri: Extended metadata issues */ #define FIX_379_ANGLE /* Eri: Extended metadata issues related to angle structure */ - #define NOKIA_PARAMBIN_REQULARIZATION /* Nokia: Contribution - Configured reqularization factor for parametric binauralizer. */ #define NOKIA_ADAPTIVE_BINAURAL_PROTOS /* Nokia: Contribution 28: Adaptive binaural prototypes */ #define NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT /* Nokia: enable adaptive binaural prototype complexity optimizations */ @@ -166,13 +164,12 @@ #define FIX_392_LATE_REVERB /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/ #define FIX_ISM_DTX_CLICKS /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */ - #define ISSUE_24_CLEANUP_MCT_LFE /* Issue 24: Cleanup LFE path withing MCT */ - #define FIX_401_DIRAC_RENDERER_META_READ_INDICES /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */ - #define REND_DEBUGGING_REVISION /* VA: encapsulate rendering debugging options with DEBUGGING */ + + /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ #endif -- GitLab From 94eb8e238cb1b7d769a6d41b6e9c7874f86f1674 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 19 Apr 2023 09:44:42 +0200 Subject: [PATCH 3/3] correct switch name --- lib_dec/ivas_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index e84825afe6..362942c52e 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -267,7 +267,7 @@ ivas_error ivas_dec( ivas_ism_render( st_ivas, output, output_frame ); } #ifdef REND_DEBUGGING_REVISION -#ifdef DEBUGGINGaa +#ifdef DEBUGGING else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV ) #else else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) -- GitLab