summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-01-22 16:36:31 -0800
committerRonghua Wu <ronghuawu@google.com>2015-01-22 16:39:12 -0800
commit841d22b0645ff48a03e7f500f95458f3d70a0a61 (patch)
tree2523212f45ae66e7a2234bd32c0d7cfd400dd1e0 /media/libstagefright/codecs
parent0c4e56d0baaa19fcf17234b38d634b7281e2ae37 (diff)
downloadframeworks_av-841d22b0645ff48a03e7f500f95458f3d70a0a61.zip
frameworks_av-841d22b0645ff48a03e7f500f95458f3d70a0a61.tar.gz
frameworks_av-841d22b0645ff48a03e7f500f95458f3d70a0a61.tar.bz2
libstagefright: Use aligned width and height.
Bug: 19014147 Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
index b783222..90d7c6b 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
@@ -292,8 +292,10 @@ Bool PVAllocVideoData(VideoDecControls *decCtrl, int width, int height, int nLay
if (video->shortVideoHeader == PV_TRUE)
{
- video->displayWidth = video->width = width;
- video->displayHeight = video->height = height;
+ video->displayWidth = width;
+ video->displayHeight = height;
+ video->width = (width + 15) & -16;
+ video->height = (height + 15) & -16;
video->nMBPerRow =
video->nMBinGOB = video->width / MB_SIZE;