diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-24 10:07:47 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-24 10:07:49 -0800 |
| commit | de8b924a7f7d104af4243b1dfaef6f4480f93eea (patch) | |
| tree | 9b84579b7355e767287ceb9fb1e0008041a83606 /media/libstagefright/codecs/amrnb | |
| parent | 80d4b8903ed09d2cf9ac35391f04eb8619f47a1e (diff) | |
| parent | e55147f462e04d41bff7ead6e9ea61a5b83bda4b (diff) | |
| download | frameworks_av-de8b924a7f7d104af4243b1dfaef6f4480f93eea.zip frameworks_av-de8b924a7f7d104af4243b1dfaef6f4480f93eea.tar.gz frameworks_av-de8b924a7f7d104af4243b1dfaef6f4480f93eea.tar.bz2 | |
Merge changes I903353c5,I822dcc74
* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Diffstat (limited to 'media/libstagefright/codecs/amrnb')
| -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; |