commit ee5201b4d9115cc7ac282155573e6354cc9c6819
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Sep 12 02:21:18 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 12 02:21:18 2017 +0000
tree 08dd5701d5f4731cde0eb75d5ba14d2ca5af2e04
parent 3aedd716efab8780d046ca449c7bd8993c163d36
parent ced401e56169d17b9b8d104dd2590690ab7a9e1e

Merge "Allow portMode configuration in loaded state only" into oc-mr1-dev

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 01d85aa..015a148 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -679,6 +679,11 @@
         return BAD_VALUE;
     }
 
+    if (mSailed || mNumPortBuffers[portIndex] > 0) {
+        android_errorWriteLog(0x534e4554, "29422020");
+        return INVALID_OPERATION;
+    }
+
     CLOG_CONFIG(setPortMode, "%s(%d), port %d", asString(mode), mode, portIndex);
 
     switch (mode) {