commit 12aba5ffc23e366674a808500a4f34a844e7224f
author Daniel Xie <dxie@google.com> Tue Sep 22 15:55:40 2015 -0700
committer Daniel Xie <dxie@google.com> Tue Sep 22 15:55:40 2015 -0700
tree 66eb82c6d0e33cf5bb1afad78b51cec4abc27c95
parent 15c762377734b273134e43026e6d5d6ffea44d22

DO NOT MERGE: fix breakage

Change-Id: Ib5b686e80021a0f84142f1691300f29e700046df

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 71fb417..4d1121a 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
@@ -169,6 +169,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;