From c87d03e78edc486d88258c17d557f3533a0133c4 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Tue, 26 Apr 2022 10:59:07 +0100 Subject: [PATCH] Add 30 second high motion clips to AndroidTestUtil. 30 second clips at higher resolutions are useful for testing encoder behaviour compared to shorter clips. PiperOrigin-RevId: 444505865 --- .../java/androidx/media3/transformer/AndroidTestUtil.java | 8 +++++++- .../transformer/mh/analysis/BitrateAnalysisTest.java | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java index 903aed6da5..0c1a092c4f 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java @@ -103,7 +103,7 @@ public final class AndroidTestUtil { .setFrameRate(57.39f) .build(); - // The 4 HIGHMOTION files are H264 and AAC. + // The 7 HIGHMOTION files are H264 and AAC. public static final String MP4_REMOTE_1280W_720H_5_SECOND_HIGHMOTION = "https://storage.googleapis.com/exoplayer-test-media-1/mp4/1280w_720h_highmotion.mp4"; public static final String MP4_REMOTE_1440W_1440H_5_SECOND_HIGHMOTION = @@ -112,6 +112,12 @@ public final class AndroidTestUtil { "https://storage.googleapis.com/exoplayer-test-media-1/mp4/1920w_1080h_highmotion.mp4"; public static final String MP4_REMOTE_3840W_2160H_5_SECOND_HIGHMOTION = "https://storage.googleapis.com/exoplayer-test-media-1/mp4/3840w_2160h_highmotion.mp4"; + public static final String MP4_REMOTE_1280W_720H_30_SECOND_HIGHMOTION = + "https://storage.googleapis.com/exoplayer-test-media-1/mp4/1280w_720h_30s_highmotion.mp4"; + public static final String MP4_REMOTE_1920W_1080H_30_SECOND_HIGHMOTION = + "https://storage.googleapis.com/exoplayer-test-media-1/mp4/1920w_1080h_30s_highmotion.mp4"; + public static final String MP4_REMOTE_3840W_2160H_32_SECOND_HIGHMOTION = + "https://storage.googleapis.com/exoplayer-test-media-1/mp4/3840w_2160h_32s_highmotion.mp4"; /** * Log in logcat and in an analysis file that this test was skipped. * diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/BitrateAnalysisTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/BitrateAnalysisTest.java index a21b25419d..e2fc11eb40 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/BitrateAnalysisTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/BitrateAnalysisTest.java @@ -49,7 +49,10 @@ public class BitrateAnalysisTest { AndroidTestUtil.MP4_REMOTE_1280W_720H_5_SECOND_HIGHMOTION, AndroidTestUtil.MP4_REMOTE_1440W_1440H_5_SECOND_HIGHMOTION, AndroidTestUtil.MP4_REMOTE_1920W_1080H_5_SECOND_HIGHMOTION, - AndroidTestUtil.MP4_REMOTE_3840W_2160H_5_SECOND_HIGHMOTION); + AndroidTestUtil.MP4_REMOTE_3840W_2160H_5_SECOND_HIGHMOTION, + AndroidTestUtil.MP4_REMOTE_1280W_720H_30_SECOND_HIGHMOTION, + AndroidTestUtil.MP4_REMOTE_1920W_1080H_30_SECOND_HIGHMOTION, + AndroidTestUtil.MP4_REMOTE_3840W_2160H_32_SECOND_HIGHMOTION); private static final ImmutableList INPUT_BITRATE_MODES = ImmutableList.of(BITRATE_MODE_VBR, BITRATE_MODE_CBR);