commit ced401e56169d17b9b8d104dd2590690ab7a9e1e
author Ram Mohan <ram.mohan@ittiam.com> Thu Aug 24 12:21:10 2017 +0530
committer Lajos Molnar <lajos@google.com> Wed Sep 06 23:08:09 2017 +0000
tree 84bdfc64ad14174f10de8237776ac0a175a672e1
parent 3b224af571e8e70ef643a36e144e7427857d271d

Allow portMode configuration in loaded state only

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 63796949

Merged-In: Ib9d3d51954ad56d4240dc055dd2e53ce14e49054
Change-Id: Ib9d3d51954ad56d4240dc055dd2e53ce14e49054

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index c749454..2a22af9 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -674,6 +674,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) {