Commit 3d456cec authored by vaclav's avatar vaclav
Browse files

accept FIX_940_DEBUGGING_VARIABLE

parent 08c94da0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */

#define FIX_911_REMOVE_CREND_DUPLICATION                /* VA: issue 911: resolve duplication of CRend binaural external renderer function */

#define FIX_938_GCC_12_WARNINGS                         /* VA: issue #938: remove set_f(.,.,0) call in which length is always 0 to remove GCC 12.0 warning */

lib_dec/ivas_qmetadata_dec.c

+1 −13
Original line number Diff line number Diff line
@@ -4247,20 +4247,13 @@ 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 )

    {
@@ -4270,9 +4263,6 @@ static void read_stream_dct_coeffs_omasa( 
        {

            sign = -1;

        }

#ifndef FIX_940_DEBUGGING_VARIABLE

        nbits++;

#endif

    }



    set_s( q_idx, 0, len_stream );
@@ -4294,9 +4284,7 @@ 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 )