From 6e400c3c3218bb9672999e8bbe46c19a370b502a Mon Sep 17 00:00:00 2001
From: Tapani Pihlajakuja <tapani.pihlajakuja@nokia.com>
Date: Wed, 8 Apr 2026 15:03:44 +0300
Subject: [PATCH 1/2] Fix float issue 1569 by adding proper error checks.

---
 apps/renderer.c     |  2 +-
 lib_com/options.h   |  1 +
 lib_rend/lib_rend.c | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/renderer.c b/apps/renderer.c
index 0ba4fce8a..2c6d6fed6 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -1179,7 +1179,7 @@ int main(
     /* Set reverb room size if specified */
     if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO )
     {
-        if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )
+        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nError setting reverb room size\n" );
             goto cleanup;
diff --git a/lib_com/options.h b/lib_com/options.h
index c5197b92a..06c4c4b0f 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -178,6 +178,7 @@
 #define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */
 #define FIX_1563_FIX_STEREO_SW                          /* VA: float issue 1563: fix clicks in stereo switching */
 #define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */
+#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index df8aaaf93..d69549d64 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -4095,11 +4095,21 @@ ivas_error IVAS_REND_AddInput(
     /* select default reverb size after adding an input */
     if ( hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )
     {
+#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS
+        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, getDefaultReverbSize( hIvasRend->inputsIsm,
+                                                                                     hIvasRend->inputsMasa,
+                                                                                     hIvasRend->inputsMc,
+                                                                                     hIvasRend->inputsSba ) ) ) != IVAS_ERR_OK )
+        {
+            return error;
+        }
+#else
         IVAS_REND_SetReverbRoomSize( hIvasRend,
                                      getDefaultReverbSize( hIvasRend->inputsIsm,
                                                            hIvasRend->inputsMasa,
                                                            hIvasRend->inputsMc,
                                                            hIvasRend->inputsSba ) );
+#endif
     }
 
     return IVAS_ERR_OK;
-- 
GitLab


From 70f568a92e6858385b86b3d711f872987b2b5028 Mon Sep 17 00:00:00 2001
From: Tapani Pihlajakuja <tapani.pihlajakuja@nokia.com>
Date: Thu, 9 Apr 2026 09:17:36 +0300
Subject: [PATCH 2/2] Add check for only changing reverb when correct output
 format.

---
 lib_rend/lib_rend.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index d69549d64..265bc4bab 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -4093,7 +4093,11 @@ ivas_error IVAS_REND_AddInput(
     setMaxGlobalDelayNs( hIvasRend );
 
     /* select default reverb size after adding an input */
+#ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS
+    if ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )
+#else
     if ( hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET )
+#endif
     {
 #ifdef FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS
         if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, getDefaultReverbSize( hIvasRend->inputsIsm,
-- 
GitLab