commit edcff1a036879938fb3a8ca4e95d7debfba93cf3
author Ram Mohan M <ram.mohan@ittiam.com> Sat Jun 10 01:32:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jun 10 01:32:42 2017 +0000
tree ee52d30f5e1102120f69dfa929251bdd15719f03
parent 134c97ee7c441ff619231ca17e705da8b3a1aed4
parent 4dc4fa7340fcff33c78c0fca4f8bc67772cd6b67

Merge "bug fix: configure input port format before setInputSurface" into oc-dev am: bd5b6f8535
am: 4dc4fa7340

Change-Id: Iea639cf139db9263df8173a7ac54590081639ec2

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp

diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
index a0786b2..ee99179 100644
--- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
+++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
@@ -1470,6 +1470,14 @@
         kPortIndexOutput = kPortIndexInput + 1;
     }
 
+    // Configure input port
+    uint32_t nFrameWidth = 352;
+    uint32_t nFrameHeight = 288;
+    uint32_t xFramerate = (30U << 16);
+    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatAndroidOpaque;
+    setupRAWPort(omxNode, kPortIndexInput, nFrameWidth, nFrameHeight, 0,
+                 xFramerate, eColorFormat);
+
     // CreateInputSurface
     EXPECT_TRUE(omx->createInputSurface(
                        [&](android::hardware::media::omx::V1_0::Status _s,