From 91cf7dce8547303c770a8adbc0c97d79f7b3f3b6 Mon Sep 17 00:00:00 2001
From: rtyag <rishabh.tyagi@dolby.com>
Date: Thu, 20 Apr 2023 15:33:18 +1000
Subject: [PATCH] fix for CNG issue in DTX frames in SBA 2TC modes

---
 lib_com/options.h                     |  1 +
 lib_dec/ivas_stereo_mdct_stereo_dec.c | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index d4ea004209..9686a9f2f6 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -171,6 +171,7 @@
 
 #define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */
 #define FIX_406_IVAS_POSITION                           /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */
+#define FIX_413_SBA_DTX                                 /*Dlb: Fix for issue 413, SBA DTX CNG in 2TC mode*/
 
 /* ################## End DEVELOPMENT switches ######################### */
 /* clang-format on */
diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c
index cccef8ec84..0e788a0821 100644
--- a/lib_dec/ivas_stereo_mdct_stereo_dec.c
+++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c
@@ -468,11 +468,22 @@ ivas_error initMdctStereoDtxData(
 
             /* Init FD-CNG */
             initFdCngDec( st );
+#ifndef FIX_413_SBA_DTX
+            if ( ch == 1 && st->cng_sba_flag )
+            {
+                st->hFdCngDec->hFdCngCom->seed += 3;
+            }
+#endif
+        }
+#ifdef FIX_413_SBA_DTX
+        if ( st->first_CNG == 0 )
+        {
             if ( ch == 1 && st->cng_sba_flag )
             {
                 st->hFdCngDec->hFdCngCom->seed += 3;
             }
         }
+#endif
 
         if ( st->cldfbAna == NULL )
         {
-- 
GitLab