commit ef92ab3799cfa9d32610b943c00a1db92e5b31d9
author Daniel Xie <dxie@google.com> Wed Jul 15 00:00:10 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 15 00:00:11 2015 +0000
tree bb3c3556e9703e9ab194a06b30d28ede26fd3ace
parent 3aac281f7a41cc53150c04399b541c3926fbae13
parent 6e995471bd916fe1efbc7d1c0e3c49d2e48dad06

Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev

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 fe28a96..8e2a5c9 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
@@ -136,7 +136,10 @@
             return;
         }
         CodecInfo infoDec = CodecInfo.getSupportedFormatInfo(mimeType, w, h, false);
-        assertNotNull(infoDec);
+        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,