From 70ca25fd6c66589b776f8437bc2f8b6d1055400a Mon Sep 17 00:00:00 2001
From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com>
Date: Wed, 6 Aug 2025 09:28:14 +0200
Subject: [PATCH 1/3] added compiler switch + changes for MR1731

---
 apps/decoder.c               | 10 ++++++++++
 lib_com/options.h            |  2 ++
 lib_dec/ivas_output_config.c |  4 ++++
 3 files changed, 16 insertions(+)

diff --git a/apps/decoder.c b/apps/decoder.c
index a091cbe30..6ad81cc79 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -406,6 +406,7 @@ int main(
         }
     }
 
+#ifndef FIX_1158_FASTCONV_REVERB_HRTF
     /*------------------------------------------------------------------------------------------*
      * Open renderer configuration reader file
      *------------------------------------------------------------------------------------------*/
@@ -426,6 +427,7 @@ int main(
             goto cleanup;
         }
     }
+#endif
 
     /*------------------------------------------------------------------------------------------*
      * Configure the decoder
@@ -619,6 +621,14 @@ int main(
             goto cleanup;
         }
 
+#ifdef FIX_1158_FASTCONV_REVERB_HRTF
+        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader )) != IVAS_ERR_OK )
+        {
+            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
+            goto cleanup;
+        }
+#endif
+
         if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
diff --git a/lib_com/options.h b/lib_com/options.h
index 39e99c6f6..75476d1b3 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -194,6 +194,8 @@
 
 #define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/
 
+#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */
+
 /* #################### End BASOP porting switches ############################ */
 
 /* clang-format on */
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index 4d7f9acfe..d4c8fdb85 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config.c
@@ -141,7 +141,11 @@ void ivas_renderer_select(
         {
             *internal_config = IVAS_AUDIO_CONFIG_HOA3;
 
+#ifdef FIX_1158_FASTCONV_REVERB_HRTF
+            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
+#else
             if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
+#endif
             {
                 *renderer_type = RENDERER_BINAURAL_FASTCONV;
             }
-- 
GitLab


From e247a31d5c07e9cf9495fe122049b335d17f58e6 Mon Sep 17 00:00:00 2001
From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com>
Date: Wed, 6 Aug 2025 09:46:25 +0200
Subject: [PATCH 2/3] clang patch

---
 apps/decoder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/decoder.c b/apps/decoder.c
index 6ad81cc79..74c93949f 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -622,7 +622,7 @@ int main(
         }
 
 #ifdef FIX_1158_FASTCONV_REVERB_HRTF
-        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader )) != IVAS_ERR_OK )
+        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
             goto cleanup;
-- 
GitLab


From 3478ebdc6d9e7164df5291e7778c2d1e3a43a58d Mon Sep 17 00:00:00 2001
From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:02:32 +0200
Subject: [PATCH 3/3] MR marked ready, restart pipeline

-- 
GitLab