From 1062a7c3bceca14f0ba281b6887caa03b1b872e3 Mon Sep 17 00:00:00 2001
From: Jouni Paulus <jouni.paulus@nokia.com>
Date: Thu, 14 Dec 2023 10:09:44 +0100
Subject: [PATCH] remove unused debugging variable causing build warnings.
 switch: FIX_940_DEBUGGING_VARIABLE

---
 lib_com/options.h            |  1 +
 lib_dec/ivas_qmetadata_dec.c | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index 8a96dabd04..bc177f9e4d 100755
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -156,6 +156,7 @@
 #define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */
 #define FIX_929_RENDERER_CMDL                           /* Nokia: issue #929: renderer command line option */
 #define FIX_910_REMOVE_DUPLICATION_TD_REND              /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */
+#define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec.c
index c3134fa8a1..68a0e71f0f 100644
--- a/lib_dec/ivas_qmetadata_dec.c
+++ b/lib_dec/ivas_qmetadata_dec.c
@@ -4247,14 +4247,20 @@ static void read_stream_dct_coeffs_omasa(
     int16_t *index,
     const int16_t first_line )
 {
+#ifdef FIX_940_DEBUGGING_VARIABLE
+    int16_t sign;
+#else
     int16_t sign, nbits;
+#endif
     int16_t i, j, i_min;
 
     float step;
     int16_t GR1, GR2;
 
     step = STEP_M2T;
+#ifndef FIX_940_DEBUGGING_VARIABLE
     nbits = 0;
+#endif
     sign = 1;
     if ( first_line == 0 )
     {
@@ -4264,7 +4270,9 @@ static void read_stream_dct_coeffs_omasa(
         {
             sign = -1;
         }
+#ifndef FIX_940_DEBUGGING_VARIABLE
         nbits++;
+#endif
     }
 
     set_s( q_idx, 0, len_stream );
@@ -4286,7 +4294,9 @@ static void read_stream_dct_coeffs_omasa(
             {
                 i_min = ( i_min << 1 ) + bit_stream[( *index )--];
             }
+#ifndef FIX_940_DEBUGGING_VARIABLE
             nbits += j;
+#endif
             /* read GR orders */
             GR1 = bit_stream[( *index )--] + 1;
             if ( GR1 == 2 )
-- 
GitLab