Commit 1db2bd41 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

EVS bitexactness issue fix

parent e1dfb4f9

lib_dec/jbm_jb4sb.c

+8 −8
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ 
#define WMC_TOOL_SKIP



#define INV_500_Q31      4294967    /*1/500 IN Q_31*/

#define INV_20_Q15      1638    /*1/20 in  Q15*/

#define DIV_600_1000_Q31 1288490189 /*600/1000 IN Q_31*/

#define INV_20_Q31       107374183  /*1/20 in  Q31*/

#define JB4_MIN( a, b )  ( ( a ) > ( b ) ? ( b ) : ( a ) )

#define JB4_MAX( a, b )  ( ( a ) > ( b ) ? ( a ) : ( b ) )
@@ -1010,7 +1011,7 @@ static void JB4_adaptDtxPlayout( 
            }

            h->targetPlayoutDelay = targetStartUp;

            move32();

            headRoom = (UWord32) W_mult0_32_32( 600, Mult_32_32( W_extract_l( W_shr( h->frameDuration, 1 ) ), INV_500_Q31 ) );

            headRoom = (UWord32) W_shr( W_mult0_32_32( DIV_600_1000_Q31, h->frameDuration ), 31 );

            /*  decided between shrinking/stretching */

            IF( GT_64( currPlayoutDelay, W_add( targetStartUp, headRoom ) ) ) /* time shrinking */

            {
@@ -1431,7 +1432,7 @@ static void JB4_popFromBuffer( 
            test();

            IF( !tempDataUnit->partial_frame && !h->lastPoppedWasSilence )

            {

                frameoffset = extract_l( Mult_32_16( JB4_rtpTimeStampDiff( h->nextExpectedTs, tempDataUnit->timeStamp ), INV_20_Q15 ) );

                frameoffset = Mult_32_32( JB4_rtpTimeStampDiff( h->nextExpectedTs, tempDataUnit->timeStamp ), INV_20_Q31 );

                test();

                IF( frameoffset > 0 && LT_16( frameoffset, MAXOFFSET ) )

                {
@@ -1508,8 +1509,7 @@ static void JB4_popFromBuffer( 
            test();

            IF( !tempDataUnit->partial_frame && !h->lastPoppedWasSilence )

            {

                frameoffset = extract_l( Mult_32_16( JB4_rtpTimeStampDiff( h->nextExpectedTs, tempDataUnit->timeStamp ), INV_20_Q15 ) );



                frameoffset = Mult_32_32( JB4_rtpTimeStampDiff( h->nextExpectedTs, tempDataUnit->timeStamp ), INV_20_Q31 );

                test();

                IF( ( frameoffset > 0 ) && LT_16( frameoffset, MAXOFFSET ) )

                {