Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de8b924a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge changes I903353c5,I822dcc74 

* changes:
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
parents 80d4b890 e55147f4

media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -299,7 +299,7 @@ static Word16 Chebps(Word16 x, 
    t0 += (Word32) * (p_f) << 13;

    t0 += (Word32) * (p_f) << 13;









    if ((UWord32)(t0 - 0xfe000000L) < 0x01ffffffL -  0xfe000000L)

    if ((UWord32)(t0 - 0xfe000000L) < (UWord32)0x03ffffffL)

    {

    {

        cheb = (Word16)(t0 >> 10);

        cheb = (Word16)(t0 >> 10);

    }

    }

media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -552,10 +552,10 @@ void set_sign12k2( 
        else

        else

        {

        {

            *(p_sign--) = -32767;                     /* sign = -1 */

            *(p_sign--) = -32767;                     /* sign = -1 */

            cor = - (cor);

            cor = negate(cor);





            /* modify dn[] according to the fixed sign */

            /* modify dn[] according to the fixed sign */

            dn[i] = - val;

            dn[i] = negate(val);

        }

        }





        *(p_en--) = cor;

        *(p_en--) = cor;