From bee35aa74b7dd8661b68a668a935dd9cbb6d2791 Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Fri, 7 Mar 2025 17:31:40 +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 8eb059537..d351f1aa1 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -181,6 +181,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 cf98199b2..64f8a80b4 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -2173,6 +2173,7 @@ ivas_error ivas_jbm_dec_render_fx(
         }
         ELSE IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )
         {
+#ifndef FIX_959_MASA_LINEAR_REND
             IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_DEC ) )
             {
                 *nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
@@ -2187,6 +2188,9 @@ ivas_error ivas_jbm_dec_render_fx(
                 }
             }
             ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )
+#else
+            IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )
+#endif
             {
                 ivas_dirac_dec_render_fx( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx );
             }
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index b8691bd3d..427aa2f1b 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config.c
@@ -447,7 +447,11 @@ void ivas_renderer_select(
                 *internal_config = IVAS_AUDIO_CONFIG_HOA3;
                 move16();
             }
+#ifdef FIX_959_MASA_LINEAR_REND
+            *renderer_type = RENDERER_SBA_LINEAR_DEC;
+#else
             st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;
+#endif
             move16();
         }
         ELSE IF( ( EQ_32( ivas_format, MASA_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) && EQ_16( st_ivas->nchan_transport, 1 ) ) ||
-- 
GitLab