From eb72e0aa09c4789c7d4583cfba5d1028f815cd9d Mon Sep 17 00:00:00 2001 From: samrobinson Date: Tue, 19 Apr 2022 18:14:43 +0100 Subject: [PATCH] Add 4 different video resolutions for bitrate analysis. PiperOrigin-RevId: 442844189 --- .../android/exoplayer2/transformer/AndroidTestUtil.java | 9 +++++++++ .../transformer/mh/analysis/BitrateAnalysisTest.java | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java index 6f5ad93cfd..b9047f6b03 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java @@ -99,6 +99,15 @@ public final class AndroidTestUtil { .setFrameRate(57.39f) .build(); + // The 4 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 = + "https://storage.googleapis.com/exoplayer-test-media-1/mp4/1440w_1440h_highmotion.mp4"; + public static final String MP4_REMOTE_1920W_1080H_5_SECOND_HIGHMOTION = + "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"; /** * Log in logcat and in an analysis file that this test was skipped. * diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/BitrateAnalysisTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/BitrateAnalysisTest.java index f52868bc9b..bcf724a768 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/BitrateAnalysisTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/BitrateAnalysisTest.java @@ -46,8 +46,10 @@ import org.junit.runners.Parameterized.Parameters; public class BitrateAnalysisTest { private static final ImmutableList INPUT_FILES = ImmutableList.of( - AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING, - AndroidTestUtil.MP4_REMOTE_4K60_PORTRAIT_URI_STRING); + 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); private static final ImmutableList INPUT_BITRATE_MODES = ImmutableList.of(BITRATE_MODE_VBR, BITRATE_MODE_CBR);