diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-30 00:09:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-30 00:09:43 +0000 |
| commit | b93a4a01e828d498ddeac38af37e1ce0677eeee1 (patch) | |
| tree | 88b96aaa725aea30c1893d1a7a08262cca91a6ee | |
| parent | 5f570d860353e307c0a93e43ce45515141a24438 (diff) | |
| parent | eaad8f2aa421ac6f3fbc964aab71e89bc974e352 (diff) | |
| download | cts-b93a4a01e828d498ddeac38af37e1ce0677eeee1.tar.gz | |
Merge "MediaCodec CTS: Add Mpeg2 interlaced clip to test list" am: eaad8f2aa4
Change-Id: I7eca76149b02e62ebf9f55dd67ccd2b6e46f65fb
3 files changed, 34 insertions, 1 deletions
diff --git a/tests/media/src/android/mediav2/cts/CodecDecoderExtTest.java b/tests/media/src/android/mediav2/cts/CodecDecoderExtTest.java index e57b3e7fd28..51a83efcb95 100644 --- a/tests/media/src/android/mediav2/cts/CodecDecoderExtTest.java +++ b/tests/media/src/android/mediav2/cts/CodecDecoderExtTest.java @@ -29,6 +29,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -46,7 +49,7 @@ public class CodecDecoderExtTest extends CodecDecoderTestBase { @Parameterized.Parameters(name = "{index}({0})") public static Collection<Object[]> input() { - return Arrays.asList(new Object[][]{ + final List<Object[]> exhaustiveArgsList = Arrays.asList(new Object[][]{ {MediaFormat.MIMETYPE_VIDEO_VP9, //show and no-show frames are sent as separate inputs "bbb_340x280_768kbps_30fps_split_non_display_frame_vp9.webm", @@ -57,7 +60,25 @@ public class CodecDecoderExtTest extends CodecDecoderTestBase { "bbb_520x390_1mbps_30fps_split_non_display_frame_vp9.webm", //show and no-show frames are sent as one input "bbb_520x390_1mbps_30fps_vp9.webm"}, + {MediaFormat.MIMETYPE_VIDEO_MPEG2, + //show and no-show frames are sent as separate inputs + "bbb_512x288_30fps_1mbps_mpeg2_interlaced_nob_1field.ts", + //show and no-show frames are sent as one input + "bbb_512x288_30fps_1mbps_mpeg2_interlaced_nob_2fields.mp4"}, }); + + Set<String> list = new HashSet<>(); + if (isHandheld() || isTv() || isAutomotive()) { + // sec 2.2.2, 2.3.2, 2.5.2 + list.add(MediaFormat.MIMETYPE_VIDEO_VP9); + } + if (isTv()) { + // sec 2.3.2 + list.add(MediaFormat.MIMETYPE_VIDEO_MPEG2); + } + ArrayList<String> cddRequiredMimeList = new ArrayList<>(list); + + return prepareParamList(cddRequiredMimeList, exhaustiveArgsList, false); } /** diff --git a/tests/media/src/android/mediav2/cts/CodecDecoderSurfaceTest.java b/tests/media/src/android/mediav2/cts/CodecDecoderSurfaceTest.java index 58d83c99e48..096b5c1d915 100644 --- a/tests/media/src/android/mediav2/cts/CodecDecoderSurfaceTest.java +++ b/tests/media/src/android/mediav2/cts/CodecDecoderSurfaceTest.java @@ -150,6 +150,12 @@ public class CodecDecoderSurfaceTest extends CodecDecoderTestBase { final List<Object[]> exhaustiveArgsList = Arrays.asList(new Object[][]{ {MediaFormat.MIMETYPE_VIDEO_MPEG2, "bbb_340x280_768kbps_30fps_mpeg2.mp4", "bbb_520x390_1mbps_30fps_mpeg2.mp4"}, + {MediaFormat.MIMETYPE_VIDEO_MPEG2, + "bbb_512x288_30fps_1mbps_mpeg2_interlaced_nob_2fields.mp4", + "bbb_520x390_1mbps_30fps_mpeg2.mp4"}, + {MediaFormat.MIMETYPE_VIDEO_MPEG2, + "bbb_512x288_30fps_1mbps_mpeg2_interlaced_nob_1field.ts", + "bbb_520x390_1mbps_30fps_mpeg2.mp4"}, {MediaFormat.MIMETYPE_VIDEO_AVC, "bbb_340x280_768kbps_30fps_avc.mp4", "bbb_520x390_1mbps_30fps_avc.mp4"}, {MediaFormat.MIMETYPE_VIDEO_AVC, "bbb_360x640_768kbps_30fps_avc.mp4", diff --git a/tests/media/src/android/mediav2/cts/CodecDecoderTest.java b/tests/media/src/android/mediav2/cts/CodecDecoderTest.java index 107d53e98fb..30ddd29ebed 100644 --- a/tests/media/src/android/mediav2/cts/CodecDecoderTest.java +++ b/tests/media/src/android/mediav2/cts/CodecDecoderTest.java @@ -196,6 +196,12 @@ public class CodecDecoderTest extends CodecDecoderTestBase { "bbb_1ch_8kHz_s16le.raw", "bbb_2ch_44kHz_aac.mp4", -1.0f}, {MediaFormat.MIMETYPE_VIDEO_MPEG2, "bbb_340x280_768kbps_30fps_mpeg2.mp4", null, "bbb_520x390_1mbps_30fps_mpeg2.mp4", -1.0f}, + {MediaFormat.MIMETYPE_VIDEO_MPEG2, + "bbb_512x288_30fps_1mbps_mpeg2_interlaced_nob_2fields.mp4", null, + "bbb_520x390_1mbps_30fps_mpeg2.mp4", -1.0f}, + {MediaFormat.MIMETYPE_VIDEO_MPEG2, + "bbb_512x288_30fps_1mbps_mpeg2_interlaced_nob_1field.ts", null, + "bbb_520x390_1mbps_30fps_mpeg2.mp4", -1.0f}, {MediaFormat.MIMETYPE_VIDEO_AVC, "bbb_340x280_768kbps_30fps_avc.mp4", null, "bbb_520x390_1mbps_30fps_avc.mp4", -1.0f}, {MediaFormat.MIMETYPE_VIDEO_HEVC, "bbb_520x390_1mbps_30fps_hevc.mp4", null, |