commit d0733af6dedd1c06792f97a45bd702247a31713f
author Ram Mohan M <ram.mohan@ittiam.com> Thu Sep 14 06:00:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 14 06:00:54 2017 +0000
tree 17afb0bf2c969248bd3d30e59f8c4c6771d2c203
parent 19eb208a45ca4ce9eb2b11ed17188d0d3e4133d2
parent cbc8c1003fe6bf082e4678972a6d0cb5ab7fcec5

Merge "bug fix: add missing color formats to the check for valid formats" into oc-mr1-dev am: 6a56323738
am: cbc8c1003f

Change-Id: Ic8d7960eeacd35b36dcb2011cba854dd6d0c2ff6

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

diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
index 1d4fd67..a5b5524 100644
--- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
+++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
@@ -839,7 +839,7 @@
     OMX_VIDEO_PARAM_PORTFORMATTYPE portFormat;
     *eColorFormat = OMX_COLOR_FormatUnused;
     portFormat.nIndex = 0;
-    while (1) {
+    while (portFormat.nIndex < 512) {
         status = getPortParam(omxNode, OMX_IndexParamVideoPortFormat,
                               kPortIndexOutput, &portFormat);
         if (status != ::android::hardware::media::omx::V1_0::Status::OK) break;
@@ -853,7 +853,9 @@
             break;
         }
         if (OMX_COLOR_FormatYUV420SemiPlanar == portFormat.eColorFormat ||
-            OMX_COLOR_FormatYUV420Planar == portFormat.eColorFormat) {
+            OMX_COLOR_FormatYUV420Planar == portFormat.eColorFormat ||
+            OMX_COLOR_FormatYUV420PackedPlanar == portFormat.eColorFormat ||
+            OMX_COLOR_FormatYUV420PackedSemiPlanar == portFormat.eColorFormat) {
             *eColorFormat = portFormat.eColorFormat;
             break;
         }