summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2011-05-18 12:30:22 +0300
committerMartin Storsjo <martin@martin.st>2011-05-18 14:24:37 +0300
commit69c2edfaf71f5494ab7a3caf26e8ab782d49781d (patch)
tree3e216e60bb69a834917cadaf7612a7cb1d8f7baa
parentf247e545b521584bb778e79710c1e60ab814839e (diff)
downloadframeworks_base-69c2edfaf71f5494ab7a3caf26e8ab782d49781d.zip
frameworks_base-69c2edfaf71f5494ab7a3caf26e8ab782d49781d.tar.gz
frameworks_base-69c2edfaf71f5494ab7a3caf26e8ab782d49781d.tar.bz2
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Initially, this code gave a warning "comparison is always false due to limited range of data type" if long was 64 bit. Additionally, the output from the AMR encoder was mostly noise. This was committed on the master branch of the opencore repository in commit f532d145194e474cb30d8644b8eee83873ad24cc, based on AOSP contribution 10904. Change-Id: I822dcc74beeae548d3032ffda759de9c8cd1fcfe
-rw-r--r--media/libstagefright/codecs/amrnb/common/src/az_lsp.cpp2
1 files changed, 1 insertions, 1 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);
}