From 6624c8d0d2df51995c6308c396fd23d31a7e587c Mon Sep 17 00:00:00 2001
From: Sandesh Venkatesh <sandesh.venkatesh@ittiam.com>
Date: Tue, 11 Feb 2025 15:28:30 +0530
Subject: [PATCH] Fixed point changes for MR !907

[float fix] port fix for float issue 920
---
 lib_com/options.h         | 1 +
 lib_com/prot_fx.h         | 5 ++++-
 lib_enc/core_enc_init.c   | 9 ++++++++-
 lib_enc/core_enc_switch.c | 4 ++++
 lib_enc/init_enc.c        | 4 ++++
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib_com/options.h b/lib_com/options.h
index 283553640..14e2a45c3 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -152,6 +152,7 @@
 #define FIX_ISSUE_1214                          /* Ittiam: Fix for issue 1214: Energy leakage in IGF tiles for MDCT-stereo @64kbps SWB*/
 #define FIX_881_HILBERT_FILTER                  /* VA: improve the precision of the Hilbert filter to remove 2kHz unwanted tone */
 #define FIX_ISSUE_1245                          /* Ittiam: Fix for issue 1245: Basop Encoder: Audible noise for silent Stereo input DTX on @24.4 kbps, @32 kbps*/
+#define FIX_920_IGF_INIT_ERROR                  /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */
 #define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */
 #define SVD_WMOPS_OPT                           /* Ittiam : SVD related optimizations */
 #define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */
diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h
index fbd3b27f3..8b76805a2 100644
--- a/lib_com/prot_fx.h
+++ b/lib_com/prot_fx.h
@@ -11067,7 +11067,10 @@ void calculate_hangover_attenuation_gain_ivas_fx(
 void init_coder_ace_plus_ivas_fx(
     Encoder_State *st,             /* i  : Encoder state                          */
     const Word32 last_total_brate, /* i  : last total bitrate                     */
-    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)   */
+#ifdef FIX_920_IGF_INIT_ERROR
+    const Word32 igf_brate, /* i  : IGF configuration bitrate           */
+#endif
+    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0)   */
 );
 
 void core_coder_reconfig_ivas_fx(
diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c
index 43e93f27c..e98956efe 100644
--- a/lib_enc/core_enc_init.c
+++ b/lib_enc/core_enc_init.c
@@ -63,7 +63,10 @@ static void init_acelp_ivas_fx( Encoder_State *st, Word16 L_frame_old, Word16 sh
 void init_coder_ace_plus_ivas_fx(
     Encoder_State *st,             /* i  : Encoder state                          */
     const Word32 last_total_brate, /* i  : last total bitrate                     */
-    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)   */
+#ifdef FIX_920_IGF_INIT_ERROR
+    const Word32 igf_brate, /* i  : IGF configuration bitrate           */
+#endif
+    const Word16 MCT_flag /* i  : hMCT handle allocated (1) or not (0)   */
 )
 {
     TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
@@ -195,7 +198,11 @@ void init_coder_ace_plus_ivas_fx(
     test();
     IF( st->igf && st->hIGFEnc != NULL )
     {
+#ifdef FIX_920_IGF_INIT_ERROR
+        IGFEncSetMode_ivas_fx( st->hIGFEnc, igf_brate, st->bwidth, st->element_mode, st->rf_mode );
+#else
         IGFEncSetMode_ivas_fx( st->hIGFEnc, st->total_brate, st->bwidth, st->element_mode, st->rf_mode );
+#endif
     }
     ELSE IF( st->hIGFEnc != NULL )
     {
diff --git a/lib_enc/core_enc_switch.c b/lib_enc/core_enc_switch.c
index e5c3903a1..b6f723c2b 100644
--- a/lib_enc/core_enc_switch.c
+++ b/lib_enc/core_enc_switch.c
@@ -229,7 +229,11 @@ void core_coder_mode_switch_ivas_fx(
         Scale_sig( st->old_inp_12k8_fx, L_INP_MEM, shift );
         st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );
         move16();
+#ifdef FIX_920_IGF_INIT_ERROR
+        init_coder_ace_plus_ivas_fx( st, last_total_brate, st->total_brate, MCT_flag );
+#else
         init_coder_ace_plus_ivas_fx( st, last_total_brate, MCT_flag );
+#endif
         if ( st->hLPDmem != NULL )
         {
             st->hLPDmem->q_lpd_old_exc = st->prev_Q_new;
diff --git a/lib_enc/init_enc.c b/lib_enc/init_enc.c
index edd887afd..7ce9f8ff5 100644
--- a/lib_enc/init_enc.c
+++ b/lib_enc/init_enc.c
@@ -1096,7 +1096,11 @@ ivas_error init_encoder_ivas_fx(
     move16();
     /* Initialize ACELP */
 #endif
+#ifdef FIX_920_IGF_INIT_ERROR
+    init_coder_ace_plus_ivas_fx( st, st->last_total_brate, igf_brate, 0 );
+#else
     init_coder_ace_plus_ivas_fx( st, st->last_total_brate, 0 );
+#endif
 
     IF( st->hLPDmem != NULL )
     {
-- 
GitLab