diff options
| author | Daniel Xie <dxie@google.com> | 2016-01-08 18:55:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-08 18:55:06 +0000 |
| commit | d84f24a2bfbeb1d0afd0ee25354874e40c6c75b4 (patch) | |
| tree | 14f3f2a522948c5908d0afd33aaccf29c15bfe93 | |
| parent | 7fcc5e2de89df6cc921f02ea4238bae9a989e912 (diff) | |
| parent | 23bf9c1abe385ebb2ee7fcf01ff9506cdaec7cf8 (diff) | |
| download | cts-kitkat-dev.tar.gz | |
Merge "DO NOT MERGE: - VideoEncoderDecoderTest#testAvc1920x1072" into kitkat-devkitkat-dev
| -rw-r--r-- | suite/cts/deviceTests/videoperf/src/com/android/cts/videoperf/VideoEncoderDecoderTest.java | 7 |
1 files changed, 5 insertions, 2 deletions
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 397b0c6d94f..1f4a04401f0 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 @@ -131,11 +131,14 @@ public class VideoEncoderDecoderTest extends CtsAndroidTestCase { private void doTest(String mimeType, int w, int h, int numberRepeat) throws Exception { CodecInfo infoEnc = CodecInfo.getSupportedFormatInfo(mimeType, w, h, true); if (infoEnc == null) { - Log.i(TAG, "Codec " + mimeType + "with " + w + "," + h + " not supported"); + Log.i(TAG, "Codec " + mimeType + " encoder with " + w + "," + h + " not supported"); return; } CodecInfo infoDec = CodecInfo.getSupportedFormatInfo(mimeType, w, h, false); - assertNotNull(infoDec); + if (infoDec == null) { + Log.i(TAG, "Codec " + mimeType + " decoder with " + w + "," + h + " not supported"); + return; + } mVideoWidth = w; mVideoHeight = h; initYUVPlane(w + YUV_PLANE_ADDITIONAL_LENGTH, h + YUV_PLANE_ADDITIONAL_LENGTH, |