From 0e4cf38fb376789c6fda4bb44c2ada3155554464 Mon Sep 17 00:00:00 2001
From: vaclav <vaclav.eksler@usherbrooke.ca>
Date: Wed, 7 May 2025 11:13:59 +0200
Subject: [PATCH] port FIX_993_REMOVE_SBA_GET_ORDER

---
 lib_com/ivas_prot_fx.h       | 3 ++-
 lib_com/ivas_sba_config_fx.c | 8 ++++++--
 lib_com/options.h            | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib_com/ivas_prot_fx.h b/lib_com/ivas_prot_fx.h
index 6c9166111..5c396140f 100644
--- a/lib_com/ivas_prot_fx.h
+++ b/lib_com/ivas_prot_fx.h
@@ -4937,12 +4937,13 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
 ivas_error ivas_sba_enc_reconfigure_fx(
     Encoder_Struct *st_ivas /* i/o: IVAS encoder structure                  */
 );
-
+#ifndef FIX_993_REMOVE_SBA_GET_ORDER
 Word16 ivas_sba_get_order_fx(
     const Word16 nb_channels, /* i  : Number of ambisonic channels            */
     const Word16 sba_planar   /* i  : SBA planar flag                         */
 );
 
+#endif
 /*! r: Ambisonic (SBA) order used for analysis and coding */
 Word16 ivas_sba_get_analysis_order(
     const Word32 ivas_total_brate, /* i  : IVAS total bitrate                      */
diff --git a/lib_com/ivas_sba_config_fx.c b/lib_com/ivas_sba_config_fx.c
index b3a0806d4..6dbe215ea 100644
--- a/lib_com/ivas_sba_config_fx.c
+++ b/lib_com/ivas_sba_config_fx.c
@@ -60,6 +60,7 @@ void ivas_sba_config_fx(
     Word16 *element_mode          /* o  : element mode of the core coder           */
 )
 {
+#ifndef FIX_993_REMOVE_SBA_GET_ORDER
     test();
     IF( sba_order < 0 && nb_channels < 0 )
     {
@@ -74,6 +75,9 @@ void ivas_sba_config_fx(
         nb_channels = ivas_sba_get_nchan_fx( sba_order, sba_planar );
     }
     ELSE
+#else
+    IF( nb_channels > 0 )
+#endif
     {
         IF( sba_planar )
         {
@@ -124,7 +128,7 @@ void ivas_sba_config_fx(
     return;
 }
 
-
+#ifndef FIX_993_REMOVE_SBA_GET_ORDER
 /*-------------------------------------------------------------------*
  * ivas_sba_get_order()
  *
@@ -174,7 +178,7 @@ Word16 ivas_sba_get_order_fx(
 
     return ( sba_order );
 }
-
+#endif
 
 /*-------------------------------------------------------------------*
  * ivas_sba_get_analysis_order()
diff --git a/lib_com/options.h b/lib_com/options.h
index c568a52fa..1b05236bb 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -101,6 +101,7 @@
 
 #define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/
 #define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */
+#define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */
 
 /* #################### End BASOP porting switches ############################ */
 
-- 
GitLab