[PORT FROM MAIN] Report errors when failing to set the input port size

BZ: 68835

The patch allows to set the input port size according to the size
required by OMXCodec. When the required size is larger than the
threshold, a OMX_ErrorBadParameter error will be reported to
OMXCodec.

Change-Id: I648a580e35d0c023b14f3313b48a08a1b4dc60cd
Signed-off-by: wfeng6 <wei.feng@intel.com>
Reviewed-on: http://android.intel.com:8080/76393
Tested-by: Tong, BoX <box.tong@intel.com>
Reviewed-by: Tong, BoX <box.tong@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>

2 files changed, 13 insertions, 1 deletions

diff --git a/base/src/componentbase.cpp b/base/src/componentbase.cpp
index 3fa7eca..c37392e 100644
--- a/base/src/componentbase.cpp
+++ b/base/src/componentbase.cpp
@@ -572,7 +572,10 @@ OMX_ERRORTYPE ComponentBase::CBaseSetParameter(
                 return OMX_ErrorIncorrectStateOperation;
         }
 
-        port->SetPortDefinition(p, false);
+        ret = port->SetPortDefinition(p, false);
+        if (ret != OMX_ErrorNone) {
+            return ret;
+        }
         break;
     }
     case OMX_IndexParamCompBufferSupplier:
diff --git a/base/src/portbase.cpp b/base/src/portbase.cpp
index a25b79c..636ce1e 100644
--- a/base/src/portbase.cpp
+++ b/base/src/portbase.cpp
@@ -199,6 +199,15 @@ OMX_ERRORTYPE PortBase::SetPortDefinition(
                 return OMX_ErrorBadParameter;
             temp.nBufferCountActual = p->nBufferCountActual;
         }
+        if ((p->nBufferSize > temp.nBufferSize) && (temp.eDir == OMX_DirInput)) {
+            if (p->nBufferSize <= MAX_INPUT_PORT_SIZE) {
+                LOGW("Input port size has been changed!");
+                temp.nBufferSize = p->nBufferSize;
+            } else {
+                LOGE("Invalid input port size!");
+                return OMX_ErrorBadParameter;
+            }
+        }
     }
     else {
         temp.nPortIndex = p->nPortIndex;