commit 8b825b8445dc792b9a94e6529c6e66777c4cf11c
author Wonsik Kim <wonsik@google.com> Tue Jul 19 23:11:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 19 23:11:58 2016 +0000
tree acd888075d6b6ccf87df1ff2727ddf50c95c9ade
parent 61f9e022a339441c4e7a90f17c1603d346bedf9a
parent dfb7744a6acda4170148a31c5241149011785271

omx: prevent input port enable/disable for software codecs am: 2b94fa8277 am: c83b53c9e5 am: f054728108 am: 062fd4a341 am: 45fb504379 am: 56fb1ed051 am: e02be17174 am: 7f58e2ec8f am: e262ff5af7 am: 360091a894
am: dfb7744a6a

Change-Id: I33e678d176f2ebf13d423fac968758e1aa003cc1

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

diff --git a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
index 60c1e2e..13afd45 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;