From a268b593c70d759d505020960c2dd7d39afbd6bc Mon Sep 17 00:00:00 2001
From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com>
Date: Tue, 10 Jun 2025 12:12:29 +0200
Subject: [PATCH] Added changes for MR port fix AEID selection

---
 lib_com/options.h               | 1 +
 lib_util/render_config_reader.c | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index 595a15810..6b66b5a8c 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -208,6 +208,7 @@
 
 
 //#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */
+#define FIX_1020_AEID_SELECTION_ERRORS                   /* Philips: issue #1020: fix for acoustic environment ID selection errors */
 #define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */
 #define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */
 
diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c
index 64f195b1e..db9508315 100644
--- a/lib_util/render_config_reader.c
+++ b/lib_util/render_config_reader.c
@@ -2245,7 +2245,11 @@ ivas_error RenderConfigReader_read(
                     return IVAS_ERR_INVALID_RENDER_CONFIG;
                 }
                 idx = strtol( strtok( NULL, ":" ), NULL, 0 );
+#ifdef FIX_1020_AEID_SELECTION_ERRORS
+                pRenderConfigReader->pAE[acIdx].id = idx;
+#else
                 pRenderConfigReader->pAE->id = idx;
+#endif
 
                 aeHasFgIdx = aeHasPredelay = aeHasRt60 = aeHasDsr = FALSE;
                 aeHasERsize = aeHasERabs = FALSE;
-- 
GitLab