commit 510417806d44ba23a015a1e3dab50578e199154e
author Marco Nelissen <marcone@google.com> Tue Jun 16 14:50:36 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 08 13:36:47 2015 -0700
tree 18a889f6fcd877c6aac2b971f76145d692119dd1
parent 9245d5f248c5fc2450ca37743c76e8635a49730b

DO NOT MERGE - Fix software video decoder buffer size calculation

Various software video decoders would specify the buffer size as if it were
fully cropped, which then failed a sanity check in SoftwareRenderer.
They now return the full buffer size.

Bug: 21717327
Bug: 21443020
Change-Id: I19fcd091827ebd52a95a5509281a07ccc156e0e5
(cherry picked from commit 3ecc9db40b1fb9c7f807a5892e5c9625aac1fb06)

media/libstagefright/codecs/on2/dec/SoftVPX.cpp

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 @@
             }
 
             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;