From 0fa0735935940ce755e78bbb344edc16ad1fc5a8 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Mon, 23 May 2022 12:08:50 +0100 Subject: [PATCH] Reorder demo samples Put cloud storage samples at the top to avoid having a sample at the top of the list where we don't control the server. Also update labels not to mention progressive container type, as it's irrelevant for Transformer, which always transmuxes even if it doesn't transcode. #ame-bug-week PiperOrigin-RevId: 450403784 --- .../transformer/ConfigurationActivity.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java index c4cec6e845..fc4fe1b9ca 100644 --- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java +++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java @@ -64,13 +64,14 @@ public final class ConfigurationActivity extends AppCompatActivity { public static final String PERIODIC_VIGNETTE_INNER_RADIUS = "periodic_vignette_inner_radius"; public static final String PERIODIC_VIGNETTE_OUTER_RADIUS = "periodic_vignette_outer_radius"; private static final String[] INPUT_URIS = { - "https://html5demos.com/assets/dizzy.mp4", - "https://storage.googleapis.com/exoplayer-test-media-1/mp4/1920w_1080h_4s.mp4", + "https://storage.googleapis.com/exoplayer-test-media-1/mp4/android-screens-10s.mp4", "https://storage.googleapis.com/exoplayer-test-media-0/android-block-1080-hevc.mp4", - "https://storage.googleapis.com/exoplayer-test-media-0/BigBuckBunny_320x180.mp4", + "https://html5demos.com/assets/dizzy.mp4", "https://html5demos.com/assets/dizzy.webm", "https://storage.googleapis.com/exoplayer-test-media-1/mp4/portrait_4k60.mp4", "https://storage.googleapis.com/exoplayer-test-media-1/mp4/8k24fps_4s.mp4", + "https://storage.googleapis.com/exoplayer-test-media-1/mp4/1920w_1080h_4s.mp4", + "https://storage.googleapis.com/exoplayer-test-media-0/BigBuckBunny_320x180.mp4", "https://storage.googleapis.com/exoplayer-test-media-1/mp4/portrait_avc_aac.mp4", "https://storage.googleapis.com/exoplayer-test-media-1/mp4/portrait_rotated_avc_aac.mp4", "https://storage.googleapis.com/exoplayer-test-media-1/mp4/slow-motion/slowMotion_stopwatch_240fps_long.mp4", @@ -78,18 +79,19 @@ public final class ConfigurationActivity extends AppCompatActivity { "https://storage.googleapis.com/exoplayer-test-media-1/mp4/samsung-hdr-hdr10.mp4", }; private static final String[] URI_DESCRIPTIONS = { // same order as INPUT_URIS - "MP4 with H264 video and AAC audio", - "Short MP4 with H265 video and AAC audio", - "MP4 with H265 video and AAC audio", - "Long MP4 with H264 video and AAC audio", - "WebM with VP8 video and Vorbis audio", - "4K 60fps MP4 with H264 video and AAC audio (portrait, timestamps always increase)", - "8k 24fps MP4 with H265 video and AAC audio", - "MP4 with H264 video and AAC audio (portrait, H > W, 0\u00B0)", - "MP4 with H264 video and AAC audio (portrait, H < W, 90\u00B0)", + "720p H264 video and AAC audio", + "1080p H265 video and AAC audio", + "360p H264 video and AAC audio", + "360p VP8 video and Vorbis audio", + "4K H264 video and AAC audio (portrait, no B-frames)", + "8k H265 video and AAC audio", + "Short 1080p H265 video and AAC audio", + "Long 180p H264 video and AAC audio", + "H264 video and AAC audio (portrait, H > W, 0\u00B0)", + "H264 video and AAC audio (portrait, H < W, 90\u00B0)", "SEF slow motion with 240 fps", - "DASH stream with non-square pixels", - "MP4 with HDR (HDR10) H265 video (encoding may fail)", + "480p DASH (non-square pixels)", + "HDR (HDR10) H265 video (encoding may fail)", }; private static final String[] DEMO_EFFECTS = { "Dizzy crop",