| commit | 64b45509f2686d0ff5ed852abdce598736d10379 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 09:42:19 2015 -0700 |
| committer | Daniel Xie <dxie@google.com> | Tue Sep 22 16:43:34 2015 +0000 |
| tree | 8b99b9eca46ec6f323a078c648ad93f56bcc1851 | |
| parent | 5f6ed7e2fa8ec00f6ecff045d5992a18559006a0 [diff] | |
| parent | 7679e48230a3b2ddb530c6626825fd7bd854bd24 [diff] |
DO NOT MERGE ANYWHERE: Merge commit '7679e48230a3b2ddb530c6626825fd7bd854bd24' into manual_merge_7679e482 Change-Id: Ic7816080fc7e79c472f6b87818ac714208452a8d
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 643f773..71fb417 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,11 +169,6 @@ 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;