Commit 5c6931f1 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch '940-release-build-failing-when-treating-warnings-as-errors' into 'main' 

Resolve #940 "Release build failing when treating warnings as errors"

See merge request !1284
parents 3c8399c7 1062a7c3

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ################################## */

lib_dec/ivas_qmetadata_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -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 )