Commit 4d52e9f7 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1321-basop-port-float-mr1284' into 'main-pc' 

Port changes of float MR1284 to BASOP code.

See merge request !1162
parents 9164eaaa 6fb900bb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,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_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -4646,7 +4646,11 @@ static void read_stream_dct_coeffs_omasa_fx( 
    Word16 *index,           /*Q0*/

    const Word16 first_line /*Q0*/ )

{

#ifdef FIX_940_DEBUGGING_VARIABLE

    Word16 sign;

#else

    Word16 sign, nbits;

#endif

    Word16 i, j, i_min;



    Word32 step;
@@ -4654,7 +4658,9 @@ static void read_stream_dct_coeffs_omasa_fx( 


    step = STEP_M2T_FX;

    move32();

#ifndef FIX_940_DEBUGGING_VARIABLE

    nbits = 0;

#endif

    move16();

    sign = 1;

    move16();
@@ -4668,7 +4674,9 @@ static void read_stream_dct_coeffs_omasa_fx( 
            sign = -1;

            move16();

        }

#ifndef FIX_940_DEBUGGING_VARIABLE

        nbits = add( nbits, 1 );

#endif

    }



    set16_fx( q_idx, 0, len_stream );
@@ -4694,7 +4702,9 @@ static void read_stream_dct_coeffs_omasa_fx( 
            {

                i_min = extract_l( L_add( shl( i_min, 1 ), bit_stream[( *index )--] ) ); /*Q0*/

            }

#ifndef FIX_940_DEBUGGING_VARIABLE

            nbits = add( nbits, j );

#endif

            /* read GR orders */

            GR1 = extract_l( L_add( bit_stream[( *index )--], 1 ) ); /*Q0*/

            IF( EQ_16( GR1, 2 ) )