Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74

Browse Source 
* commit '428ece23f414d288981ea0ac8f326e9e71a57959':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
This commit is contained in:
Jean-Baptiste Queru
2012-02-24 10:30:12 -08:00
committed by Android Git Automerger
parent 1527811984 428ece23f4
commit 78fc0c0bfa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp
View File

@@ -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);
} }

4
media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp
View File

@@ -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;