commit f7e37679d1d20ac3c0e6fae7060269fcb51d5e52
author Daniel Xie <dxie@google.com> Thu Sep 10 00:16:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 10 00:16:27 2015 +0000
tree 0ab566a200377f6be0cd2dcd47090fa5e372fc89
parent cc07775017d143c15d3a27b5f2a7155467849ea7
parent 8022911e3ac3f4165c450901ee2dda036fe3cbf4

am 8022911e: am 013fe123: am ef92ab37: Merge "Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue" into kitkat-cts-dev

* commit '8022911e3ac3f4165c450901ee2dda036fe3cbf4':
  Fix CTS com.android.cts.videoperf.VideoEncoderDecoderTest issue

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,