commit 1bceff916a72246fa208605d50615823d7f1688b
author Andreas Huber <andih@google.com> Mon Nov 23 14:03:32 2009 -0800
committer Andreas Huber <andih@google.com> Mon Nov 23 14:06:42 2009 -0800
tree ede82a7ecb01828c9557cf61f58f098f24bae676
parent e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a

Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 9297aff0..10a4986 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -462,7 +462,7 @@
     }
 
     int32_t maxInputSize;
-    if (createEncoder && meta->findInt32(kKeyMaxInputSize, &maxInputSize)) {
+    if (meta->findInt32(kKeyMaxInputSize, &maxInputSize)) {
         codec->setMinBufferSize(kPortIndexInput, (OMX_U32)maxInputSize);
     }
 
@@ -487,12 +487,18 @@
 
     if (def.nBufferSize < size) {
         def.nBufferSize = size;
-
     }
 
     err = mOMX->setParameter(
             mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));
     CHECK_EQ(err, OK);
+
+    err = mOMX->getParameter(
+            mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));
+    CHECK_EQ(err, OK);
+
+    // Make sure the setting actually stuck.
+    CHECK(def.nBufferSize >= size);
 }
 
 status_t OMXCodec::setVideoPortFormatType(