Merge commit '451b577ddfde5496c447f939051287e825d37c55' into m
Change-Id: Ie5dc4b6b5e94c2b125f742b232b2fc5e3bcb2343
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 5e76de9..8f928cf 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
@@ -137,11 +137,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;
initYUVPlane(w + YUV_PLANE_ADDITIONAL_LENGTH, h + YUV_PLANE_ADDITIONAL_LENGTH,