diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-01-08 22:36:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-08 22:36:32 +0000 |
| commit | 5bc678de3c4386874b516e5cfae8ff9d5d7865ed (patch) | |
| tree | 8942c43d20691d07f604af6972951c64000a5825 /media/libstagefright/codecs | |
| parent | d8b04298431d0eb16a93c14609a33eacc722a3fa (diff) | |
| parent | 9a9c9be1f8c1664253d11f8913a30998a2950521 (diff) | |
| download | frameworks_av-5bc678de3c4386874b516e5cfae8ff9d5d7865ed.zip frameworks_av-5bc678de3c4386874b516e5cfae8ff9d5d7865ed.tar.gz frameworks_av-5bc678de3c4386874b516e5cfae8ff9d5d7865ed.tar.bz2 | |
am 9a9c9be1: am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute size." into lmp-mr1-dev
* commit '9a9c9be1f8c1664253d11f8913a30998a2950521':
Use aligned width and height to compute size.
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp | 9 |
1 files changed, 6 insertions, 3 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 844bd14..b783222 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp @@ -247,10 +247,13 @@ OSCL_EXPORT_REF Bool PVInitVideoDecoder(VideoDecControls *decCtrl, uint8 *volbuf video->vol[idx]->useReverseVLC = 0; video->intra_acdcPredDisable = 1; video->vol[idx]->scalability = 0; - video->size = (int32)width * height; - 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->size = (int32)video->width * video->height; + #ifdef PV_ANNEX_IJKT_SUPPORT video->modified_quant = 0; video->advanced_INTRA = 0; |