Commit 483c4bcb authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

EVS BE fix

parent 248e6b7e

lib_com/basop_settings.h

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#pragma warning( disable : 4310 )

#endif



#ifndef IVAS_FLOAT_FIXED

#ifdef IVAS_FLOAT_FIXED

/*!

  \def  Macro converts a float < 1 to Word32 fixed point with saturation and rounding

*/
@@ -97,7 +97,7 @@ 
#define WORD162FL_SCALE( x, scale ) ( ( (float) ( (int32_t) ( x ) ) ) / ( (int64_t) 1 << ( WORD16_BITS - 1 - ( scale ) ) ) )

#endif



#ifndef IVAS_FLOAT_FIXED

#ifdef IVAS_FLOAT_FIXED

/*!

  \def   Macro converts a float < 1 to Word16 fixed point with saturation and rounding, shifts result right by scale

*/

lib_com/basop_util.c

+2 −2
Original line number Diff line number Diff line
@@ -1319,14 +1319,14 @@ static Word16 fixp_sin_cos_residual_16( 


    if ( flag_radix2 == 0 )

    {

        x = mult_r( x, 10430 /* 1 / EVS_PI in Q15 */ );

        x = mult_r( x, FL2WORD16( 1.0 / EVS_PI ) );

    }

    s = shr( x, shift );



    residual = s_and( x, ( 1 << shift ) - 1 );

    /* We assume "2+scale" is a constant */

    residual = shl( residual, 2 + scale );

    residual = mult_r( residual, EVS_PI_FX / 4 );

    residual = mult_r( residual, FL2WORD16( EVS_PI / 4.0 ) );



    /* Sine sign symmetry */

    ssign = s_and( s, ( 1 << LD ) << 1 );

lib_com/rom_com.c

+3 −3
Original line number Diff line number Diff line
@@ -36556,11 +36556,11 @@ const Word16 *const Ratios_fx[2][17] =/* 7Q8 */ 
        , Ratios_WB_18_fx

    }

};













#define QGC(x) FL2WORD16_SCALE(x, 4)















const Word16 qGains[2][1 << kTcxHmNumGainBits] =















{













    /* GC */ { 12 },













    /* VC */ { 10, 22, 72, 160 }













    /* GC */ { QGC(0.75f) },













    /* VC */ { QGC(0.6f), QGC(1.4f), QGC(4.5f), QGC(10.0f) }















};