Add additional video files.

These are providing more variety and complexity.

All files are okay to be public.

PiperOrigin-RevId: 460935247

library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/BitrateAnalysisTest.java

@@ -17,6 +17,24 @@ package com.google.android.exoplayer2.transformer.mh.analysis;
 
 
 import static android.media.MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR;
 import static android.media.MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR;
 import static android.media.MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR;
 import static android.media.MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1280W_720H_30_SECOND_HIGHMOTION;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1280W_720H_30_SECOND_ROOF_ONEPLUSNORD2;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1280W_720H_32_SECOND_ROOF_REDMINOTE9;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1280W_720H_5_SECOND_HIGHMOTION;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1440W_1440H_31_SECOND_ROOF_SAMSUNGS20ULTRA5G;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1440W_1440H_5_SECOND_HIGHMOTION;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1920W_1080H_30_SECOND_HIGHMOTION;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1920W_1080H_5_SECOND_HIGHMOTION;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1920W_1080H_60_FPS_30_SECOND_ROOF_ONEPLUSNORD2;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_1920W_1080H_60_FPS_30_SECOND_ROOF_REDMINOTE9;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_2400W_1080H_34_SECOND_ROOF_SAMSUNGS20ULTRA5G;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_3840W_2160H_30_SECOND_ROOF_ONEPLUSNORD2;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_3840W_2160H_30_SECOND_ROOF_REDMINOTE9;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_3840W_2160H_32_SECOND_HIGHMOTION;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_3840W_2160H_5_SECOND_HIGHMOTION;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_640W_480H_31_SECOND_ROOF_SONYXPERIAXZ3;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_7680W_4320H_31_SECOND_ROOF_SAMSUNGS20ULTRA5G;
+import static com.google.android.exoplayer2.transformer.AndroidTestUtil.skipAndLogIfInsufficientCodecSupport;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.net.Uri;
 import android.net.Uri;
@@ -47,13 +65,24 @@ import org.junit.runners.Parameterized.Parameters;
 public class BitrateAnalysisTest {
 public class BitrateAnalysisTest {
   private static final ImmutableList<String> INPUT_FILES =
   private static final ImmutableList<String> INPUT_FILES =
       ImmutableList.of(
       ImmutableList.of(
-          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_1280W_720H_30_SECOND_HIGHMOTION,
-          AndroidTestUtil.MP4_REMOTE_1920W_1080H_30_SECOND_HIGHMOTION,
-          AndroidTestUtil.MP4_REMOTE_3840W_2160H_32_SECOND_HIGHMOTION);
+          MP4_REMOTE_640W_480H_31_SECOND_ROOF_SONYXPERIAXZ3,
+          MP4_REMOTE_1280W_720H_5_SECOND_HIGHMOTION,
+          MP4_REMOTE_1280W_720H_30_SECOND_HIGHMOTION,
+          MP4_REMOTE_1280W_720H_30_SECOND_ROOF_ONEPLUSNORD2,
+          MP4_REMOTE_1280W_720H_32_SECOND_ROOF_REDMINOTE9,
+          MP4_REMOTE_1440W_1440H_5_SECOND_HIGHMOTION,
+          MP4_REMOTE_1440W_1440H_31_SECOND_ROOF_SAMSUNGS20ULTRA5G,
+          MP4_REMOTE_1920W_1080H_5_SECOND_HIGHMOTION,
+          MP4_REMOTE_1920W_1080H_30_SECOND_HIGHMOTION,
+          MP4_REMOTE_1920W_1080H_60_FPS_30_SECOND_ROOF_ONEPLUSNORD2,
+          MP4_REMOTE_1920W_1080H_60_FPS_30_SECOND_ROOF_REDMINOTE9,
+          MP4_REMOTE_2400W_1080H_34_SECOND_ROOF_SAMSUNGS20ULTRA5G,
+          MP4_REMOTE_3840W_2160H_5_SECOND_HIGHMOTION,
+          MP4_REMOTE_3840W_2160H_32_SECOND_HIGHMOTION,
+          MP4_REMOTE_3840W_2160H_30_SECOND_ROOF_ONEPLUSNORD2,
+          MP4_REMOTE_3840W_2160H_30_SECOND_ROOF_REDMINOTE9,
+          MP4_REMOTE_7680W_4320H_31_SECOND_ROOF_SAMSUNGS20ULTRA5G);
+
   private static final ImmutableList<Integer> INPUT_BITRATE_MODES =
   private static final ImmutableList<Integer> INPUT_BITRATE_MODES =
       ImmutableList.of(BITRATE_MODE_VBR, BITRATE_MODE_CBR);
       ImmutableList.of(BITRATE_MODE_VBR, BITRATE_MODE_CBR);
 
 
@@ -100,7 +129,7 @@ public class BitrateAnalysisTest {
     }
     }
 
 
     Context context = ApplicationProvider.getApplicationContext();
     Context context = ApplicationProvider.getApplicationContext();
-    if (AndroidTestUtil.skipAndLogIfInsufficientCodecSupport(
+    if (skipAndLogIfInsufficientCodecSupport(
         context,
         context,
         testId,
         testId,
         /* decodingFormat= */ AndroidTestUtil.getFormatForTestFile(fileUri),
         /* decodingFormat= */ AndroidTestUtil.getFormatForTestFile(fileUri),