From b5f700be073fbb68f171cb8fddb19414b64499f5 Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Fri, 9 Jan 2026 11:10:03 +0100
Subject: [PATCH] REMOVE_CAM_FROM_IVAS

---
 lib_com/options.h                | 1 +
 lib_enc/decision_matrix_enc_fx.c | 5 ++++-
 lib_enc/enc_prm_fx.c             | 7 +++++--
 lib_enc/evs_enc_fx.c             | 8 ++++++++
 lib_enc/ivas_core_enc_fx.c       | 3 ++-
 lib_enc/prot_fx_enc.h            | 6 ++++--
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/lib_com/options.h b/lib_com/options.h
index 532a00be2..0895b0fdb 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -112,6 +112,7 @@
 #define FIX_1872_REMOVE_UNUSED_PSNOISEGEN_ISAR              /* Dolby: Remove unused psNoiseGen from ISAR */
 #define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */
 #define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX  /* FhG/VA: init nb_bits_metadata to zero */
+#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/decision_matrix_enc_fx.c b/lib_enc/decision_matrix_enc_fx.c
index 086b6e86a..f73a524ce 100644
--- a/lib_enc/decision_matrix_enc_fx.c
+++ b/lib_enc/decision_matrix_enc_fx.c
@@ -752,13 +752,15 @@ void signalling_enc_fx(
 }
 
 /*---------------------------------------------------------------------*
- * signalling_enc_rf()
+ * signaling_enc_rf()
  *
  * write channel-aware signalling information into the bitstream
  *---------------------------------------------------------------------*/
+
 void signaling_enc_rf_fx(
     Encoder_State *st /* i  : encoder state structure   */
 )
+#ifndef REMOVE_CAM_FROM_IVAS
 {
     Word16 i;
     Word16 sfr;
@@ -833,6 +835,7 @@ void signaling_enc_rf_fx(
 void signalling_enc_rf_fx(
     Encoder_State *st /* i  : encoder state structure   */
 )
+#endif
 {
     Word16 i;
     Word16 sfr;
diff --git a/lib_enc/enc_prm_fx.c b/lib_enc/enc_prm_fx.c
index 6a861b8af..d0b050ac0 100644
--- a/lib_enc/enc_prm_fx.c
+++ b/lib_enc/enc_prm_fx.c
@@ -93,13 +93,14 @@ static void enc_prm_hm_ivas_fx(
     }
 }
 
+
 /*-----------------------------------------------------------------*
- * Function  enc_prm_rf_fx()                                          *
+ * Function  enc_prm_rf_fx()                                       *
  * ~~~~~~~~~~~~~~~~~~~~~~                                          *
  *                                                                 *
  * encode RF parameters for ACELP and TCX partial copy             *
  *-----------------------------------------------------------------*/
-
+#ifndef REMOVE_CAM_FROM_IVAS
 void enc_prm_rf_ivas_fx(
     Encoder_State *st,
     const Word16 rf_frame_type, /* Q0 */
@@ -271,6 +272,8 @@ void enc_prm_rf_ivas_fx(
     /* write RF frame type last in the bitstream */
     push_next_indice( hBstr, rf_frame_type, 3 );
 }
+#endif
+
 void enc_prm_rf_fx(
     Encoder_State *st,
     const Word16 rf_frame_type, /* Q0 */
diff --git a/lib_enc/evs_enc_fx.c b/lib_enc/evs_enc_fx.c
index 416c2f4e9..34336ef79 100644
--- a/lib_enc/evs_enc_fx.c
+++ b/lib_enc/evs_enc_fx.c
@@ -531,7 +531,15 @@ ivas_error evs_enc_fx(
      * Channel-aware mode - write signaling information into the bitstream
      *---------------------------------------------------------------------*/
 
+#ifdef REMOVE_CAM_FROM_IVAS
+    signaling_enc_rf_fx( st );
+
+    /*---------------------------------------------------------------------*
+     * Updates
+     *---------------------------------------------------------------------*/
+#else
     signalling_enc_rf_fx( st );
+#endif
 
     updt_enc_common_fx( st, Etot, Q_new );
 
diff --git a/lib_enc/ivas_core_enc_fx.c b/lib_enc/ivas_core_enc_fx.c
index 2ee800325..e74701f16 100644
--- a/lib_enc/ivas_core_enc_fx.c
+++ b/lib_enc/ivas_core_enc_fx.c
@@ -827,12 +827,13 @@ ivas_error ivas_core_enc_fx(
         st->q_inp = q_inp[1];
         move16();
 
+#ifndef REMOVE_CAM_FROM_IVAS
         /*---------------------------------------------------------------------*
          * Channel-aware mode - write signaling information into the bitstream
          *---------------------------------------------------------------------*/
 
         signaling_enc_rf_fx( st );
-
+#endif
         /*---------------------------------------------------------------------*
          * Common updates
          *---------------------------------------------------------------------*/
diff --git a/lib_enc/prot_fx_enc.h b/lib_enc/prot_fx_enc.h
index 13d11e72b..29cff05f6 100644
--- a/lib_enc/prot_fx_enc.h
+++ b/lib_enc/prot_fx_enc.h
@@ -2765,11 +2765,12 @@ void enc_prm_rf_fx(
     const Word16 rf_frame_type,
     const Word16 fec_offset );
 
+#ifndef REMOVE_CAM_FROM_IVAS
 void enc_prm_rf_ivas_fx(
     Encoder_State *st,
     const Word16 rf_frame_type,
     const Word16 fec_offset );
-
+#endif
 void E_ACELP_pulsesign(
     const Word16 cn[] /*Q_xn*/,
     Word16 dn[] /*Qdn*/,
@@ -2966,10 +2967,11 @@ void signaling_enc_rf_fx(
     Encoder_State *st /* i  : encoder state structure   */
 );
 
+#ifndef REMOVE_CAM_FROM_IVAS
 void signalling_enc_rf_fx(
     Encoder_State *st /* i  : encoder state structure                   */
 );
-
+#endif
 void IGFEncResetTCX10BitCounter_fx(
     const IGF_ENC_INSTANCE_HANDLE hInstance /**< in:     | instance handle of IGF Encoder */
 );
-- 
GitLab