From 5c3588cc985f04e852ec8d1eba27a902109f7f7d Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Wed, 6 Mar 2024 12:12:40 +0100
Subject: [PATCH] issue 1022: remove unused function ivas_param_ism_dec();
 under FIX_1022_REMOVE_PARAMISM_DEC

---
 lib_com/ivas_prot.h          |  2 ++
 lib_com/options.h            |  1 +
 lib_dec/ivas_ism_param_dec.c | 14 +++++++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index e80b23aa15..dab1f1036f 100755
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -1097,11 +1097,13 @@ void ivas_param_ism_dec_close(
     const AUDIO_CONFIG output_config                            /* i  : output audio configuration                  */
 );
 
+#ifndef FIX_1022_REMOVE_PARAMISM_DEC
 void ivas_param_ism_dec(
     Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */
     float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */
 );
 
+#endif
 void ivas_ism_dec_digest_tc(
     Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */
 );
diff --git a/lib_com/options.h b/lib_com/options.h
index 52901ec9c4..32ee53a784 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -159,6 +159,7 @@
 #define FIX_998_UNUSED_FUNCTION                         /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */ 
 #define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */
 #define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */
+#define FIX_1022_REMOVE_PARAMISM_DEC                    /* VA: issue 1022: remove unused function ivas_param_ism_dec() */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c
index 9d1e179c8b..9337ccb08a 100644
--- a/lib_dec/ivas_ism_param_dec.c
+++ b/lib_dec/ivas_ism_param_dec.c
@@ -324,7 +324,7 @@ static void ivas_param_ism_render_slot(
     return;
 }
 
-
+#ifndef FIX_1022_REMOVE_PARAMISM_DEC
 static void ivas_param_ism_rendering(
     PARAM_ISM_DEC_HANDLE hParamIsmDec,
     SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,
@@ -361,7 +361,7 @@ static void ivas_param_ism_rendering(
 
     return;
 }
-
+#endif
 
 static ivas_error ivas_param_ism_rendering_init(
     PARAM_ISM_RENDERING_HANDLE hParamIsmRendering,
@@ -729,7 +729,7 @@ void ivas_param_ism_dec_close(
     return;
 }
 
-
+#ifndef FIX_1022_REMOVE_PARAMISM_DEC
 /*-------------------------------------------------------------------------*
  * ivas_param_ism_dec()
  *
@@ -973,7 +973,7 @@ void ivas_param_ism_dec(
 
     return;
 }
-
+#endif
 
 /*-------------------------------------------------------------------------*
  * ivas_ism_dec_digest_tc()
@@ -1121,7 +1121,7 @@ void ivas_param_ism_dec_digest_tc(
         nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;
     }
 
-    push_wmops( "ivas_param_ism_dec" );
+    push_wmops( "ivas_param_ism_dec_digest_tc" );
 
     /* general setup */
     ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hParamIsmDec->hParamIsmRendering->interpolator );
@@ -1533,8 +1533,10 @@ void ivas_param_ism_params_to_masa_param_mapping(
         st_ivas->hISMDTX.dtx_flag = 1;
     }
 
+#ifndef FIX_1022_REMOVE_PARAMISM_DEC
     if ( st_ivas->nchan_ism > 1 )
     {
+#endif
         if ( st_ivas->hISMDTX.dtx_flag )
         {
             float energy_ratio;
@@ -1598,6 +1600,7 @@ void ivas_param_ism_params_to_masa_param_mapping(
                 }
             }
         }
+#ifndef FIX_1022_REMOVE_PARAMISM_DEC
     }
     else
     {
@@ -1617,6 +1620,7 @@ void ivas_param_ism_params_to_masa_param_mapping(
             }
         }
     }
+#endif
 
     return;
 }
-- 
GitLab