commit eaba159bcc432361b1d000b7fd384d0bddcbc0f9
author Daniel Xie <dxie@google.com> Tue Sep 22 15:55:40 2015 -0700
committer Daniel Xie <dxie@google.com> Tue Sep 22 22:57:52 2015 +0000
tree 9faeff1ee19c4928bac225b48ba4c440787bef4d
parent 54c452f2342105178dc51153782f428890202c06

DO NOT MERGE ANYWHERE: fix breakage

Change-Id: Ib5b686e80021a0f84142f1691300f29e700046df
(cherry picked from commit 12aba5ffc23e366674a808500a4f34a844e7224f)

suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java

diff --git a/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java b/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
index 8f928cf..979aebc 100644
--- a/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
+++ b/suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java
@@ -137,6 +137,13 @@
             Log.i(TAG, "Encoder " + mimeType + " with " + w + "," + h + " not supported");
             return;
         }
+
+        CodecInfo infoDec = CodecInfo.getSupportedFormatInfo(mimeType, w, h, false);
+        if (infoDec == null) {
+            Log.i(TAG, "Codec " + mimeType + "with " + w + "," + h + " not supported");
+            return;
+        }
+
         mVideoWidth = w;
         mVideoHeight = h;
         initYUVPlane(w + YUV_PLANE_ADDITIONAL_LENGTH, h + YUV_PLANE_ADDITIONAL_LENGTH,