Commit fe513ca6 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1321-ref-port-float-mr1284' into 'float-pc' 

Port changes of float repo MR1284 to float reference code.

See merge request !1161
parents 7e0378a1 e1d59ed7

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ 
#define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING           /* Dlb: issue 907: fix for band mapping at VLBR */           

#define NONBE_FIX_869_MASA_PREREND_MERGE                      /* Nokia: issue: #869: MASA pre-rend not updating energy */

#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 BASOP porting switches ############################ */

lib_dec/ivas_qmetadata_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -4263,7 +4263,11 @@ 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;

#ifndef NONBE_1319_M2R_PRECISION_ALIGN

    float step;
@@ -4275,7 +4279,9 @@ static void read_stream_dct_coeffs_omasa( 
#else

    step = STEP_M2T;

#endif

#ifndef FIX_940_DEBUGGING_VARIABLE

    nbits = 0;

#endif

    sign = 1;

    if ( first_line == 0 )

    {
@@ -4285,7 +4291,9 @@ static void read_stream_dct_coeffs_omasa( 
        {

            sign = -1;

        }

#ifndef FIX_940_DEBUGGING_VARIABLE

        nbits++;

#endif

    }



    set_s( q_idx, 0, len_stream );
@@ -4307,7 +4315,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 )