From 08356a6847596164c0d7205bf3322055b0c20188 Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Tue, 12 Aug 2025 13:54:05 +0200
Subject: [PATCH] port MR

---
 lib_com/options.h                   | 1 +
 lib_dec/ivas_stereo_cng_dec.c       | 4 ++++
 lib_dec/ivas_stereo_switching_dec.c | 5 +++++
 lib_enc/ivas_stereo_switching_enc.c | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index 218c6a4ab..d48440df8 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -205,6 +205,7 @@
 #define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */
 #define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */
 #define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */
+#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */
 
 /* #################### End BASOP porting switches ############################ */
 
diff --git a/lib_dec/ivas_stereo_cng_dec.c b/lib_dec/ivas_stereo_cng_dec.c
index c0d7c02a3..3d44edac6 100644
--- a/lib_dec/ivas_stereo_cng_dec.c
+++ b/lib_dec/ivas_stereo_cng_dec.c
@@ -923,6 +923,10 @@ void stereo_cna_update_params(
     }
     else
     {
+#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING
+        hFdCngDec->first_cna_noise_updated = 0;
+#endif
+
         return;
     }
 
diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec.c
index 89630fcfa..087c54252 100644
--- a/lib_dec/ivas_stereo_switching_dec.c
+++ b/lib_dec/ivas_stereo_switching_dec.c
@@ -1551,6 +1551,11 @@ void stereo_switching_dec(
         mvr2r( sts[0]->old_exc, sts[1]->old_exc, L_EXC_MEM_DEC );
         mvr2r( sts[0]->lsf_old, sts[1]->lsf_old, M );
         mvr2r( sts[0]->lsp_old, sts[1]->lsp_old, M );
+
+#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING
+        sts[1]->last_core_brate = sts[0]->last_core_brate;
+#endif
+
         if ( hCPE->element_mode == IVAS_CPE_MDCT )
         {
             sts[1]->last_core = sts[0]->last_core;
diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc.c
index 4fe1660ae..cc1f0b643 100644
--- a/lib_enc/ivas_stereo_switching_enc.c
+++ b/lib_enc/ivas_stereo_switching_enc.c
@@ -801,6 +801,10 @@ void stereo_switching_enc(
         mvr2r( sts[0]->lsf_old1, sts[1]->lsf_old1, M );
         mvr2r( sts[0]->lsp_old1, sts[1]->lsp_old1, M );
 
+#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING
+        sts[1]->last_core_brate = sts[0]->last_core_brate;
+#endif
+
         sts[1]->GSC_noisy_speech = 0;
         if ( hCPE->element_mode == IVAS_CPE_MDCT )
         {
-- 
GitLab