commit 062fd4a341396c77f549d48e3c8afb9baf21ce85
author Wonsik Kim <wonsik@google.com> Tue Jul 19 22:51:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 19 22:51:43 2016 +0000
tree be462db8aa3c04d78a8bf242370a3cf5edfc29ff
parent 5d925fce788ddf4fe3a7146dfe144f15b7a21826
parent f054728108e7ec42d05260c5b1fb045e54553704

omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5
am: f054728108

Change-Id: I230da4ea86abf01ff9057900f0eea1af151c9a00

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

diff --git a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
index d36c1d5..fd55e88 100644
--- a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
+++ b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
@@ -469,6 +469,13 @@
     CHECK_EQ((int)port->mTransition, (int)PortInfo::NONE);
     CHECK(port->mDef.bEnabled == !enable);
 
+    if (port->mDef.eDir != OMX_DirOutput) {
+        ALOGE("Port enable/disable allowed only on output ports.");
+        notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);
+        android_errorWriteLog(0x534e4554, "29421804");
+        return;
+    }
+
     if (!enable) {
         port->mDef.bEnabled = OMX_FALSE;
         port->mTransition = PortInfo::DISABLING;