diff options
author | Narayan Kamath <narayan@google.com> | 2014-03-11 18:16:23 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:16:23 +0000 |
commit | bc9e1aa4fe8815c0b213ede636f0d0ea4ad14afc (patch) | |
tree | 96b40be78ec2e42f88217d7b7f8bd530746baf4c /media | |
parent | 0f1c0f0d7a2a8f2419e0218d1dc03c4b02260e7a (diff) | |
parent | 096d72a32824a0a8c86a716ba44d589183b2b0b3 (diff) | |
download | frameworks_av-bc9e1aa4fe8815c0b213ede636f0d0ea4ad14afc.zip frameworks_av-bc9e1aa4fe8815c0b213ede636f0d0ea4ad14afc.tar.gz frameworks_av-bc9e1aa4fe8815c0b213ede636f0d0ea4ad14afc.tar.bz2 |
am 096d72a3: Merge "AArch64: Correction for LP64"
* commit '096d72a32824a0a8c86a716ba44d589183b2b0b3':
AArch64: Correction for LP64
Diffstat (limited to 'media')
-rwxr-xr-x | media/libstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c b/media/libstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c index 15eabfb..52c85e5 100755 --- a/media/libstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c +++ b/media/libstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c @@ -1110,7 +1110,7 @@ void Intra16x16PlanePrediction(u8 *data, u8 *above, u8 *left) /* Variables */ - u32 i, j; + i32 i, j; i32 a, b, c; i32 tmp; @@ -1123,20 +1123,20 @@ void Intra16x16PlanePrediction(u8 *data, u8 *above, u8 *left) a = 16 * (above[15] + left[15]); for (i = 0, b = 0; i < 8; i++) - b += ((i32)i + 1) * (above[8+i] - above[6-i]); + b += (i + 1) * (above[8+i] - above[6-i]); b = (5 * b + 32) >> 6; for (i = 0, c = 0; i < 7; i++) - c += ((i32)i + 1) * (left[8+i] - left[6-i]); + c += (i + 1) * (left[8+i] - left[6-i]); /* p[-1,-1] has to be accessed through above pointer */ - c += ((i32)i + 1) * (left[8+i] - above[-1]); + c += (i + 1) * (left[8+i] - above[-1]); c = (5 * c + 32) >> 6; for (i = 0; i < 16; i++) { for (j = 0; j < 16; j++) { - tmp = (a + b * ((i32)j - 7) + c * ((i32)i - 7) + 16) >> 5; + tmp = (a + b * (j - 7) + c * (i - 7) + 16) >> 5; data[i*16+j] = (u8)CLIP1(tmp); } } |