From aed9294951412b449a3f5c928d9d5ac5e7019b4e Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Fri, 7 Mar 2025 17:26:57 +0100
Subject: [PATCH] port FIX_959_MASA_LINEAR_REND

---
 lib_com/options.h            | 1 +
 lib_dec/ivas_jbm_dec.c       | 4 ++++
 lib_dec/ivas_output_config.c | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index 2846a9a5a..bbb5c730d 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -198,6 +198,7 @@
 #define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS
 #define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
 #endif
+#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index e23600095..a0eeece6f 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -1119,6 +1119,7 @@ ivas_error ivas_jbm_dec_render(
         }
         else if ( st_ivas->ivas_format == MASA_FORMAT )
         {
+#ifndef FIX_959_MASA_LINEAR_REND
             if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC )
             {
                 *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
@@ -1133,6 +1134,9 @@ ivas_error ivas_jbm_dec_render(
                 }
             }
             else if ( st_ivas->renderer_type == RENDERER_DIRAC )
+#else
+            if ( st_ivas->renderer_type == RENDERER_DIRAC )
+#endif
             {
                 ivas_dirac_dec_render( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );
             }
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index 5b86725b1..156963b82 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config.c
@@ -368,7 +368,11 @@ void ivas_renderer_select(
             {
                 *internal_config = IVAS_AUDIO_CONFIG_HOA3;
             }
+#ifdef FIX_959_MASA_LINEAR_REND
+            *renderer_type = RENDERER_SBA_LINEAR_DEC;
+#else
             st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;
+#endif
         }
         else if ( ( ivas_format == MASA_FORMAT && output_config == IVAS_AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ||
                   ( ivas_format == SBA_FORMAT && ( output_config == IVAS_AUDIO_CONFIG_STEREO || output_config == IVAS_AUDIO_CONFIG_MONO ) ) )
-- 
GitLab