Commit 14e73093 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT

parent 4df2d6e0

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */

#define FIX_2338_HARM_GSC_GAIN_COMP                     /* VA: basop issue 2338: harmonization of band gain computation for both EVS and IVAS */

#define FIX_BASOP_2361_OTR                              /* FhG: Basop issue 2361: Orientation tracking tests for equivalent rotations fail */

#define FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER           /* FhG/VA: basop issue 2396: keep TC channel pointers in one constant place during decoding and rendering */

lib_com/swb_tbe_com_fx.c

+0 −15
Original line number Diff line number Diff line
@@ -6165,7 +6165,6 @@ void create_random_vector_fx( 
      j and k values for any input (e.g. if Random() returns 5000)

    */



#ifdef FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT

    if ( element_mode != EVS_MONO )

    {

        j = shr( abs_s( Random( &seed[0] ) ), 7 ); /* Random( &seed[0] * 0.0078125f ) */
@@ -6175,13 +6174,8 @@ void create_random_vector_fx( 
        L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[0] ) ) ); /*Q23 */

        j = extract_l( L_shr( L_tmp, 23 ) );

    }

#else

    L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[0] ) ) ); /*Q23 */

    j = extract_l( L_shr( L_tmp, 23 ) );

#endif

    j = s_and( j, 0xff );



#ifdef FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT

    if ( element_mode != EVS_MONO )

    {

        k = shr( abs_s( Random( &seed[1] ) ), 7 ); /* Random( &seed[0] * 0.0078125f ) */
@@ -6191,16 +6185,11 @@ void create_random_vector_fx( 
        L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

        k = extract_l( L_shr( L_tmp, 23 ) );

    }

#else

    L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

    k = extract_l( L_shr( L_tmp, 23 ) );

#endif



    k = s_and( k, 0xff );



    WHILE( EQ_16( k, j ) )

    {

#ifdef FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT

        if ( element_mode != EVS_MONO )

        {

            k = shr( abs_s( Random( &seed[1] ) ), 7 );
@@ -6210,10 +6199,6 @@ void create_random_vector_fx( 
            L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

            k = extract_l( L_shr( L_tmp, 23 ) );

        }

#else

        L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

        k = extract_l( L_shr( L_tmp, 23 ) );

#endif



        k = s_and( k, 0xff );

    }