From 9828ca61a0374d789c130ac0a6fabd9e84d39687 Mon Sep 17 00:00:00 2001
From: Erik Norvell <erik.norvell@ericsson.com>
Date: Fri, 14 Jun 2024 12:43:13 +0200
Subject: [PATCH] Fixes for compiling with DEBUGGING active

---
 apps/decoder.c           | 2 +-
 apps/encoder.c           | 2 +-
 apps/renderer.c          | 2 +-
 lib_com/bits_alloc_fx.c  | 1 +
 lib_rend/ivas_crend.c    | 4 ++--
 lib_rend/ivas_rotation.c | 2 +-
 lib_rend/lib_rend.c      | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/decoder.c b/apps/decoder.c
index abe1788de..dc1cc25b3 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -54,7 +54,7 @@
  * Local constants
  *------------------------------------------------------------------------------------------*/
 
-#if !defined( WMOPS_FLT )
+#if !defined( DEBUGGING ) && !defined( WMOPS_FLT )
 static
 #endif
     int32_t frame = 0; /* Counter of frames */
diff --git a/apps/encoder.c b/apps/encoder.c
index c8e6f32d6..283f1626a 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -48,7 +48,7 @@
  * Local constants, enums
  *------------------------------------------------------------------------------------------*/
 
-#if !defined( WMOPS )
+#if !defined( DEBUGGING ) && !defined( WMOPS )
 static
 #endif
     int32_t frame = 0; /* Counter of frames */
diff --git a/apps/renderer.c b/apps/renderer.c
index 5f39dc4e6..1cc4c1a32 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -67,7 +67,7 @@
 #define IVAS_MIN16B_FLT ( -32768.0f )
 #define IVAS_MAX16B_FX  32767
 #define IVAS_MIN16B_FX  ( -32768 )
-#if !defined( WMOPS )
+#if !defined( DEBUGGING ) && !defined( WMOPS )
 static
 #endif
     int32_t frame = 0;
diff --git a/lib_com/bits_alloc_fx.c b/lib_com/bits_alloc_fx.c
index 514a9f894..c8d9fc7e2 100644
--- a/lib_com/bits_alloc_fx.c
+++ b/lib_com/bits_alloc_fx.c
@@ -615,6 +615,7 @@ ivas_error config_acelp1(
     Word32 core_brate_inpI = core_brate_inp;
 #ifdef REMOVE_IVAS_UNUSED_PARAMETERS_WARNING
     (void) active_cnt;
+    (void) core_brate_inpI;
 #endif
 #endif
     ivas_error error;
diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c
index b678a90f8..3f345bc5f 100644
--- a/lib_rend/ivas_crend.c
+++ b/lib_rend/ivas_crend.c
@@ -3161,7 +3161,7 @@ static ivas_error ivas_rend_crendConvolver(
 
 
             ivas_mdft_fx( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length );
-#ifdef DEBUGGING
+#ifdef DUMPS_ENABLED
             dbgwrite_txt( pFreq_buf_re, subframe_length, "Fixed_pFreq_buf_re_mdft.txt", NULL );
             dbgwrite_txt( pFreq_buf_im, subframe_length, "Fixed_pFreq_buf_im_mdft.txt", NULL );
 #endif
@@ -3223,7 +3223,7 @@ static ivas_error ivas_rend_crendConvolver(
 
         ivas_imdft_fx( tmp_out_re, tmp_out_im, pOut, subframe_length );
 
-#ifdef DEBUGGING
+#ifdef DUMPS_ENABLED
         dbgwrite_txt( pOut, subframe_length << 1, "Fixed_imdft_out.txt", NULL );
 #endif
         pFreq_buf_re = &pcm_out[j][i_ts * subframe_length];
diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c
index be96d186f..23290c3de 100644
--- a/lib_rend/ivas_rotation.c
+++ b/lib_rend/ivas_rotation.c
@@ -1385,7 +1385,7 @@ void rotateFrame_shd_cldfb(
     /* calculate Ambisonics rotation matrix from the quaternion */
     SHrotmatgen_fx( SHrotmat, Rmat, shd_rot_max_order );
 
-#ifdef DEBUGGING
+#ifdef DUMPS_ENABLED
     dbgwrite_txt( SHrotmat, HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM, "Fixed_SHrotmat.txt", NULL );
 #endif
     /* rotation by mtx multiplication */
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index 63c64149e..e0c8abd76 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -8775,7 +8775,7 @@ static ivas_error rotateFrameSba_fx(
         /* calculate ambisonics rotation matrices for the previous and current frames */
         SHrotmatgen_fx( gains, Rmat, shd_rot_max_order );
 
-#ifdef DEBUGGING
+#ifdef DUMPS_ENABLED
         dbgwrite_txt( gains, HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM, "Fixed_code_gains.txt", NULL );
         dbgwrite_txt( Rmat, 3 * 3, "Fixed_code_Rmat.txt", NULL );
 #endif
-- 
GitLab