From 896f8e2e763c5c03f4446548629c31c0288df85e Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 25 Mar 2026 12:58:40 +0100 Subject: [PATCH] Added minor cleanup/harmonization under FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN --- lib_com/options.h | 2 +- lib_rend/ivas_objectRenderer_sources.c | 4 ++++ lib_rend/ivas_stat_rend.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index bbea3aa15..3f3f8fbc0 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -161,7 +161,7 @@ /*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */ #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */ #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */ - +#define FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN /* Eri: Basop issue 2469: TD renderer gain has wrong Q. In float this is just a synch of the cleanup done in BASOP */ /* #################### End BE switches ################################## */ diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources.c index f3e45d3e8..c7587ad30 100644 --- a/lib_rend/ivas_objectRenderer_sources.c +++ b/lib_rend/ivas_objectRenderer_sources.c @@ -269,9 +269,13 @@ static void TDREND_SRC_REND_Init( /* SrcGain */ for ( nC = 0; nC < SPAT_BIN_MAX_INPUT_CHANNELS; nC++ ) { +#ifdef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN + SrcRend_p->SrcGain_p[nC] = 1.0f; +#else SrcRend_p->SrcGainMin_p[nC] = 0.0f; SrcRend_p->SrcGain_p[nC] = 1.0f; SrcRend_p->SrcGainMax_p[nC] = 2.0f; +#endif } SrcRend_p->SrcGainUpdated = FALSE; diff --git a/lib_rend/ivas_stat_rend.h b/lib_rend/ivas_stat_rend.h index 58bbff890..f24660dd5 100644 --- a/lib_rend/ivas_stat_rend.h +++ b/lib_rend/ivas_stat_rend.h @@ -1074,8 +1074,10 @@ typedef struct TDREND_SRC_REND_s /* Gains */ int16_t SrcGainUpdated; float SrcGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; +#ifndef FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN float SrcGainMin_p[SPAT_BIN_MAX_INPUT_CHANNELS]; float SrcGainMax_p[SPAT_BIN_MAX_INPUT_CHANNELS]; +#endif float DirGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; float DistGain_p[SPAT_BIN_MAX_INPUT_CHANNELS]; -- GitLab