Skip to content

SDK / exoplayer

Go to a project
Commit e6343a34 by huangdarwin Committed by Rohit Singh
Options

Test: Move 4k60 test file to local from remote. 

This test file used to be remote, which led to various errors in loading the file or timing out during the muxer or overall transformer.

export4k60 test timing on Pixel 7:

|Condition                 |elapsedTimeMs|AS Test "Duration" (s)|
|--------------------------|-------------|----------------------|
|local file (this CL)      |4253         |14                    |
|Remote file, googleguest  |5510         |17                    |
|Remote file, 4G           |11423        |25                    |

PiperOrigin-RevId: 516815462
parent d635fa52
Inline Side-by-side
Showing with 18 additions and 18 deletions
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java
...@@ -134,6 +134,17 @@ public final class AndroidTestUtil { ...@@ -134,6 +134,17 @@ public final class AndroidTestUtil {
public static final String MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER = public static final String MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER =
"asset:///media/mp4/hdr10-video-with-sdr-container.mp4"; "asset:///media/mp4/hdr10-video-with-sdr-container.mp4";
public static final String MP4_ASSET_4K60_PORTRAIT_URI_STRING =
"asset:///media/mp4/portrait_4k60.mp4";
public static final Format MP4_ASSET_4K60_PORTRAIT_FORMAT =
new Format.Builder()
.setSampleMimeType(VIDEO_H264)
.setWidth(3840)
.setHeight(2160)
.setFrameRate(57.39f)
.setCodecs("avc1.640033")
.build();
public static final String MP4_REMOTE_10_SECONDS_URI_STRING = public static final String MP4_REMOTE_10_SECONDS_URI_STRING =
"https://storage.googleapis.com/exoplayer-test-media-1/mp4/android-screens-10s.mp4"; "https://storage.googleapis.com/exoplayer-test-media-1/mp4/android-screens-10s.mp4";
public static final Format MP4_REMOTE_10_SECONDS_FORMAT = public static final Format MP4_REMOTE_10_SECONDS_FORMAT =
...@@ -158,17 +169,6 @@ public final class AndroidTestUtil { ...@@ -158,17 +169,6 @@ public final class AndroidTestUtil {
.setCodecs("avc1.64001F") .setCodecs("avc1.64001F")
.build(); .build();
public static final String MP4_REMOTE_4K60_PORTRAIT_URI_STRING =
"https://storage.googleapis.com/exoplayer-test-media-1/mp4/portrait_4k60.mp4";
public static final Format MP4_REMOTE_4K60_PORTRAIT_FORMAT =
new Format.Builder()
.setSampleMimeType(VIDEO_H264)
.setWidth(3840)
.setHeight(2160)
.setFrameRate(57.39f)
.setCodecs("avc1.640033")
.build();
public static final String MP4_REMOTE_8K24_URI_STRING = public static final String MP4_REMOTE_8K24_URI_STRING =
"https://storage.googleapis.com/exoplayer-test-media-1/mp4/8k24fps_4s.mp4"; "https://storage.googleapis.com/exoplayer-test-media-1/mp4/8k24fps_4s.mp4";
public static final Format MP4_REMOTE_8K24_FORMAT = public static final Format MP4_REMOTE_8K24_FORMAT =
...@@ -678,12 +678,12 @@ public final class AndroidTestUtil { ...@@ -678,12 +678,12 @@ public final class AndroidTestUtil {
return MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_FORMAT; return MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_FORMAT;
case MP4_ASSET_SEF_URI_STRING: case MP4_ASSET_SEF_URI_STRING:
return MP4_ASSET_SEF_FORMAT; return MP4_ASSET_SEF_FORMAT;
case MP4_ASSET_4K60_PORTRAIT_URI_STRING:
return MP4_ASSET_4K60_PORTRAIT_FORMAT;
case MP4_REMOTE_10_SECONDS_URI_STRING: case MP4_REMOTE_10_SECONDS_URI_STRING:
return MP4_REMOTE_10_SECONDS_FORMAT; return MP4_REMOTE_10_SECONDS_FORMAT;
case MP4_REMOTE_H264_MP3_URI_STRING: case MP4_REMOTE_H264_MP3_URI_STRING:
return MP4_REMOTE_H264_MP3_FORMAT; return MP4_REMOTE_H264_MP3_FORMAT;
case MP4_REMOTE_4K60_PORTRAIT_URI_STRING:
return MP4_REMOTE_4K60_PORTRAIT_FORMAT;
case MP4_REMOTE_256W_144H_30_SECOND_ROOF_ONEPLUSNORD2_DOWNSAMPLED: case MP4_REMOTE_256W_144H_30_SECOND_ROOF_ONEPLUSNORD2_DOWNSAMPLED:
return MP4_REMOTE_256W_144H_30_SECOND_ROOF_ONEPLUSNORD2_DOWNSAMPLED_FORMAT; return MP4_REMOTE_256W_144H_30_SECOND_ROOF_ONEPLUSNORD2_DOWNSAMPLED_FORMAT;
case MP4_REMOTE_426W_240H_30_SECOND_ROOF_ONEPLUSNORD2_DOWNSAMPLED: case MP4_REMOTE_426W_240H_30_SECOND_ROOF_ONEPLUSNORD2_DOWNSAMPLED:
......
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/ExportTest.java
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
*/ */
package com.google.android.exoplayer2.transformer.mh; package com.google.android.exoplayer2.transformer.mh;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_4K60_PORTRAIT_FORMAT;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_4K60_PORTRAIT_URI_STRING;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_SEF_URI_STRING; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_SEF_URI_STRING;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_URI_STRING; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_URI_STRING;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_FORMAT; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_FORMAT;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_4K60_PORTRAIT_FORMAT;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_4K60_PORTRAIT_URI_STRING;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_8K24_FORMAT; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_8K24_FORMAT;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_8K24_URI_STRING; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_REMOTE_8K24_URI_STRING;
import static com.google.android.exoplayer2.transformer.AndroidTestUtil.recordTestSkipped; import static com.google.android.exoplayer2.transformer.AndroidTestUtil.recordTestSkipped;
...@@ -125,7 +125,7 @@ public class ExportTest { ...@@ -125,7 +125,7 @@ public class ExportTest {
if (AndroidTestUtil.skipAndLogIfFormatsUnsupported( if (AndroidTestUtil.skipAndLogIfFormatsUnsupported(
context, context,
testId, testId,
/* inputFormat= */ MP4_REMOTE_4K60_PORTRAIT_FORMAT, /* inputFormat= */ MP4_ASSET_4K60_PORTRAIT_FORMAT,
/* outputFormat= */ null)) { /* outputFormat= */ null)) {
return; return;
} }
...@@ -134,7 +134,7 @@ public class ExportTest { ...@@ -134,7 +134,7 @@ public class ExportTest {
new Transformer.Builder(context) new Transformer.Builder(context)
.setEncoderFactory(new ForceEncodeEncoderFactory(context)) .setEncoderFactory(new ForceEncodeEncoderFactory(context))
.build(); .build();
MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_REMOTE_4K60_PORTRAIT_URI_STRING)); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_4K60_PORTRAIT_URI_STRING));
new TransformerAndroidTestRunner.Builder(context, transformer) new TransformerAndroidTestRunner.Builder(context, transformer)
.setRequestCalculateSsim(true) .setRequestCalculateSsim(true)
.setTimeoutSeconds(180) .setTimeoutSeconds(180)
......
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java
...@@ -50,7 +50,7 @@ public class EncoderPerformanceAnalysisTest { ...@@ -50,7 +50,7 @@ public class EncoderPerformanceAnalysisTest {
ImmutableList.of( ImmutableList.of(
AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_URI_STRING, AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_URI_STRING,
AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING, AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING,
AndroidTestUtil.MP4_REMOTE_4K60_PORTRAIT_URI_STRING); AndroidTestUtil.MP4_ASSET_4K60_PORTRAIT_URI_STRING);
private static final ImmutableList<Integer> OPERATING_RATE_SETTINGS = private static final ImmutableList<Integer> OPERATING_RATE_SETTINGS =
ImmutableList.of(VideoEncoderSettings.NO_VALUE, 30, Integer.MAX_VALUE); ImmutableList.of(VideoEncoderSettings.NO_VALUE, 30, Integer.MAX_VALUE);
......
testdata/src/test/assets/media/mp4/portrait_4k60.mp4 0 → 100644
The file could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment