| commit | 78fc0c0bfae913a4a44011225396ae525b335fb1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 24 10:30:12 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 24 10:30:12 2012 -0800 |
| tree | 9f7e71d439b0e2e28568cebe4db81863daf1dbc4 | |
| parent | 1527811984557ee0b5d6e476e84ed147e073cb45 [diff] | |
| parent | 428ece23f414d288981ea0ac8f326e9e71a57959 [diff] |
am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 * commit '428ece23f414d288981ea0ac8f326e9e71a57959': stagefright amrnb: Properly negate all values stagefright amrnb: Fix a bug on architectures where long is 64 bit
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 @@ 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 @@ 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;