From 4b4940d8ab77d42f06026a37c733ed4ff60b385b Mon Sep 17 00:00:00 2001
From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com>
Date: Wed, 4 Jun 2025 13:35:30 +0200
Subject: [PATCH 1/3] =?UTF-8?q?=C3=84dded=20compiler=20switch=20+=20logic?=
 =?UTF-8?q?=20for=20rt60=20and=20dsr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib_com/options.h               | 2 +-
 lib_util/render_config_reader.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib_com/options.h b/lib_com/options.h
index 3315e495e..50db4e9e5 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -126,7 +126,7 @@
 
 #endif
 
-
+#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */
 #define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */
 #define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
 #define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */
diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c
index a1f806d6b..dae55f18c 100644
--- a/lib_util/render_config_reader.c
+++ b/lib_util/render_config_reader.c
@@ -2255,7 +2255,11 @@ ivas_error RenderConfigReader_read(
                     /* RT60 */
                     else if ( strcmp( item, "RT60" ) == 0 )
                     {
+#ifdef FIX_777_COMBI_RENDER_CONFIG_FILE
+                        if ( read_txt_vector( pValue, pRenderConfigReader->pAE[acIdx].pFG->nrBands, pRenderConfigReader->pAE[acIdx].pRT60 ) )
+#else
                         if ( read_txt_vector( pValue, pRenderConfigReader->pFG[idx].nrBands, pRenderConfigReader->pAE[acIdx].pRT60 ) )
+#endif
                         {
                             errorHandler( item, ERROR_VALUE_INVALID );
                             return IVAS_ERR_INVALID_RENDER_CONFIG;
@@ -2265,7 +2269,11 @@ ivas_error RenderConfigReader_read(
                     /* DSR */
                     else if ( strcmp( item, "DSR" ) == 0 )
                     {
+#ifdef FIX_777_COMBI_RENDER_CONFIG_FILE
+                        if ( read_txt_vector( pValue, pRenderConfigReader->pAE[acIdx].pFG->nrBands, pRenderConfigReader->pAE[acIdx].pDSR ) )
+#else
                         if ( read_txt_vector( pValue, pRenderConfigReader->pFG[idx].nrBands, pRenderConfigReader->pAE[acIdx].pDSR ) )
+#endif
                         {
                             errorHandler( item, ERROR_VALUE_INVALID );
                             return IVAS_ERR_INVALID_RENDER_CONFIG;
-- 
GitLab


From d72e34237b2f0894b607017aa676704f641841a2 Mon Sep 17 00:00:00 2001
From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com>
Date: Wed, 4 Jun 2025 13:45:47 +0200
Subject: [PATCH 2/3] commit for push

---
 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 50db4e9e5..99013a1c5 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -126,7 +126,7 @@
 
 #endif
 
-#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */
+//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */
 #define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */
 #define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
 #define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */
-- 
GitLab


From d82c0de87438e2a1e95de57a7415935886296a9d Mon Sep 17 00:00:00 2001
From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:14:07 +0200
Subject: [PATCH 3/3] restart CI

-- 
GitLab