From a0561069fe9c1a961d5aeb010b63a9246c475385 Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Tue, 20 May 2025 17:23:23 +0200
Subject: [PATCH 1/2] port FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO

---
 lib_com/options.h         | 1 +
 lib_dec/ivas_jbm_dec_fx.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index 48c7534d6..0ddb06df4 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -119,6 +119,7 @@
 #define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN             /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */
 #define NONBE_FIX_982_OMASA_DELAY_COMP_5MS               /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
 #define NONBE_FIX_975_JBM_USAN                                /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */
+#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index c85e36d8e..8db29e4df 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -175,6 +175,7 @@ ivas_error ivas_jbm_dec_tc_fx(
         {
             hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
         }
+#ifndef FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO
 
         test();
         IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) && EQ_16( st_ivas->hDecoderConfig->nchan_out, 1 ) )
@@ -192,6 +193,7 @@ ivas_error ivas_jbm_dec_tc_fx(
                 Scale_sig32( p_output_fx[i], output_frame, negate( s ) ); // Q11
             }
         }
+#endif
     }
     ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )
     {
-- 
GitLab


From 423d89c59dac6f17a8e1b08e45dc56b260fc220a Mon Sep 17 00:00:00 2001
From: Archit Tamarapu <archit.tamarapu@iis.fraunhofer.de>
Date: Thu, 22 May 2025 12:04:26 +0200
Subject: [PATCH 2/2] increase split rendering job timeout to 60 minutes

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27535f94c..7e06c92b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1379,7 +1379,7 @@ split-rendering-pytest-on-merge-request:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request-to-main-pc
   needs: ["build-codec-linux-make"]
-  timeout: "45 minutes"
+  timeout: "60 minutes"
   stage: compare
   script:
     - *print-common-info
-- 
GitLab