From 643c73c7b36ce6ba186852bf1c171652bac31690 Mon Sep 17 00:00:00 2001
From: rtyag <rishabh.tyagi@dolby.com>
Date: Thu, 17 Apr 2025 14:57:55 +1000
Subject: [PATCH] BASOP porting: Issue 949: fix for 5ms framing/rendering in MC
 mode

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

diff --git a/lib_com/options.h b/lib_com/options.h
index 240c9430d..c301e5bea 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -95,6 +95,7 @@
 #endif
 #define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */
 #define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA                 /* Nokia: issue 944: fix FEC error in OMASA */
+#define NONBE_FIX_949_MC_5MS_FRAMING                    /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index 0aeefc667..d2b3986d7 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -2237,6 +2237,14 @@ ivas_error ivas_jbm_dec_render_fx(
     }
     ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )
     {
+
+#ifdef NONBE_FIX_949_MC_5MS_FRAMING
+        FOR( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )
+        {
+            p_tc_fx[n] = &st_ivas->hTcBuffer->tc_fx[n][st_ivas->hTcBuffer->n_samples_rendered];
+        }
+#endif
+
         IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )
         {
             Word16 crendInPlaceRotation = FALSE;
-- 
GitLab