diff --git a/libraries/test_data/src/test/assets/media/mp4/portrait_4k60.mp4 b/libraries/test_data/src/test/assets/media/mp4/portrait_4k60.mp4 new file mode 100644 index 0000000000..9b6bd0557c Binary files /dev/null and b/libraries/test_data/src/test/assets/media/mp4/portrait_4k60.mp4 differ 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 4740e0d29e..8ebc1a5c41 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java @@ -134,6 +134,17 @@ public final class AndroidTestUtil { public static final String MP4_ASSET_1080P_1_SECOND_HDR10_VIDEO_SDR_CONTAINER = "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 = "https://storage.googleapis.com/exoplayer-test-media-1/mp4/android-screens-10s.mp4"; public static final Format MP4_REMOTE_10_SECONDS_FORMAT = @@ -158,17 +169,6 @@ public final class AndroidTestUtil { .setCodecs("avc1.64001F") .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 = "https://storage.googleapis.com/exoplayer-test-media-1/mp4/8k24fps_4s.mp4"; public static final Format MP4_REMOTE_8K24_FORMAT = @@ -678,12 +678,12 @@ public final class AndroidTestUtil { return MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_FORMAT; case MP4_ASSET_SEF_URI_STRING: 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: return MP4_REMOTE_10_SECONDS_FORMAT; case MP4_REMOTE_H264_MP3_URI_STRING: 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: return MP4_REMOTE_256W_144H_30_SECOND_ROOF_ONEPLUSNORD2_DOWNSAMPLED_FORMAT; case MP4_REMOTE_426W_240H_30_SECOND_ROOF_ONEPLUSNORD2_DOWNSAMPLED: diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java index 79414fa399..b3185d9a4a 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java @@ -15,12 +15,12 @@ */ package androidx.media3.transformer.mh; +import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_4K60_PORTRAIT_FORMAT; +import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_4K60_PORTRAIT_URI_STRING; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_SEF_URI_STRING; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_URI_STRING; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_FORMAT; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING; -import static androidx.media3.transformer.AndroidTestUtil.MP4_REMOTE_4K60_PORTRAIT_FORMAT; -import static androidx.media3.transformer.AndroidTestUtil.MP4_REMOTE_4K60_PORTRAIT_URI_STRING; import static androidx.media3.transformer.AndroidTestUtil.MP4_REMOTE_8K24_FORMAT; import static androidx.media3.transformer.AndroidTestUtil.MP4_REMOTE_8K24_URI_STRING; import static androidx.media3.transformer.AndroidTestUtil.recordTestSkipped; @@ -125,7 +125,7 @@ public class ExportTest { if (AndroidTestUtil.skipAndLogIfFormatsUnsupported( context, testId, - /* inputFormat= */ MP4_REMOTE_4K60_PORTRAIT_FORMAT, + /* inputFormat= */ MP4_ASSET_4K60_PORTRAIT_FORMAT, /* outputFormat= */ null)) { return; } @@ -134,7 +134,7 @@ public class ExportTest { new Transformer.Builder(context) .setEncoderFactory(new ForceEncodeEncoderFactory(context)) .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) .setRequestCalculateSsim(true) .setTimeoutSeconds(180) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java index 992f3d6628..dcdfe35c0e 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java @@ -50,7 +50,7 @@ public class EncoderPerformanceAnalysisTest { ImmutableList.of( AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_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 OPERATING_RATE_SETTINGS = ImmutableList.of(VideoEncoderSettings.NO_VALUE, 30, Integer.MAX_VALUE);