diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-25 23:25:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-25 23:25:17 +0000 |
| commit | f1dc8e29649b51010bdac55d4f509b2a1fdad922 (patch) | |
| tree | f511bdaa7cfeecebfa575d546a7deb59473fb7da /media/libstagefright/codecs | |
| parent | 74d08b264718cd4026ec3acb918ae5c72adbb68f (diff) | |
| parent | 524f99469df44f47fd21d160b8434d40dd11bd65 (diff) | |
| download | frameworks_av-f1dc8e29649b51010bdac55d4f509b2a1fdad922.zip frameworks_av-f1dc8e29649b51010bdac55d4f509b2a1fdad922.tar.gz frameworks_av-f1dc8e29649b51010bdac55d4f509b2a1fdad922.tar.bz2 | |
am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '524f99469df44f47fd21d160b8434d40dd11bd65':
DO NOT MERGE - Fix software video decoder buffer size calculation
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/on2/dec/SoftVPX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp index 8a95643..f026761 100644 --- a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp +++ b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp @@ -147,7 +147,7 @@ void SoftVPX::onQueueFilled(OMX_U32 /* portIndex */) { } outHeader->nOffset = 0; - outHeader->nFilledLen = (width * height * 3) / 2; + outHeader->nFilledLen = (outputBufferWidth() * outputBufferHeight() * 3) / 2; outHeader->nFlags = EOSseen ? OMX_BUFFERFLAG_EOS : 0; outHeader->nTimeStamp = inHeader->nTimeStamp; |