diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 10:33:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-24 10:33:05 -0800 |
| commit | 837b1e098a3b321bf1b19f22189d8c8bcdd509a6 (patch) | |
| tree | 10fbed746f00a90b2911c3437734d7345d4e6f7d /media | |
| parent | dab48426d9b2becf45bef409f607045f066d6f72 (diff) | |
| parent | 391906630443d7bd1d3a34e34535d93113723316 (diff) | |
| download | frameworks_av-837b1e098a3b321bf1b19f22189d8c8bcdd509a6.zip frameworks_av-837b1e098a3b321bf1b19f22189d8c8bcdd509a6.tar.gz frameworks_av-837b1e098a3b321bf1b19f22189d8c8bcdd509a6.tar.bz2 | |
am 78fc0c0b: am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74
* commit '78fc0c0bfae913a4a44011225396ae525b335fb1':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp b/media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp index bd99b30..4135f30 100644 --- a/media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp @@ -299,7 +299,7 @@ static Word16 Chebps(Word16 x, t0 += (Word32) * (p_f) << 13; - if ((UWord32)(t0 - 0xfe000000L) < 0x01ffffffL - 0xfe000000L) + if ((UWord32)(t0 - 0xfe000000L) < (UWord32)0x03ffffffL) { cheb = (Word16)(t0 >> 10); } diff --git a/media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp b/media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp index dedf91a..d626de3 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/set_sign.cpp @@ -552,10 +552,10 @@ void set_sign12k2( else { *(p_sign--) = -32767; /* sign = -1 */ - cor = - (cor); + cor = negate(cor); /* modify dn[] according to the fixed sign */ - dn[i] = - val; + dn[i] = negate(val); } *(p_en--) = cor; |