From 99ea70345588a697d795c299594fe657c851ca85 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 9 Oct 2023 08:15:30 -0700 Subject: [PATCH] Fix the asset and dump file names for the standalone TTML DASH test #minor-release PiperOrigin-RevId: 571941997 (cherry picked from commit 33c151eb5b5ce85e554215af0c1d860b66c66fab) --- .../exoplayer/dash/e2etest/DashPlaybackTest.java | 4 ++-- .../{ttml-in-mp4 => standalone-ttml}/sample.mpd | 0 .../sample.video.mp4 | Bin .../{ttml-in-mp4 => standalone-ttml}/sample.xml | 0 .../dash/{ttml-in-mp4.dump => standalone-ttml.dump} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename libraries/test_data/src/test/assets/media/dash/{ttml-in-mp4 => standalone-ttml}/sample.mpd (100%) rename libraries/test_data/src/test/assets/media/dash/{ttml-in-mp4 => standalone-ttml}/sample.video.mp4 (100%) rename libraries/test_data/src/test/assets/media/dash/{ttml-in-mp4 => standalone-ttml}/sample.xml (100%) rename libraries/test_data/src/test/assets/playbackdumps/dash/{ttml-in-mp4.dump => standalone-ttml.dump} (100%) diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java index 5d4ee4b9fb..882a3e2594 100644 --- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java +++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java @@ -67,14 +67,14 @@ public final class DashPlaybackTest { DefaultTrackSelector trackSelector = checkNotNull((DefaultTrackSelector) player.getTrackSelector()); trackSelector.setParameters(trackSelector.buildUponParameters().setPreferredTextLanguage("en")); - player.setMediaItem(MediaItem.fromUri("asset:///media/dash/ttml-in-mp4/sample.mpd")); + player.setMediaItem(MediaItem.fromUri("asset:///media/dash/standalone-ttml/sample.mpd")); player.prepare(); player.play(); TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED); player.release(); DumpFileAsserts.assertOutput( - applicationContext, playbackOutput, "playbackdumps/dash/ttml-in-mp4.dump"); + applicationContext, playbackOutput, "playbackdumps/dash/standalone-ttml.dump"); } // https://github.com/google/ExoPlayer/issues/7985 diff --git a/libraries/test_data/src/test/assets/media/dash/ttml-in-mp4/sample.mpd b/libraries/test_data/src/test/assets/media/dash/standalone-ttml/sample.mpd similarity index 100% rename from libraries/test_data/src/test/assets/media/dash/ttml-in-mp4/sample.mpd rename to libraries/test_data/src/test/assets/media/dash/standalone-ttml/sample.mpd diff --git a/libraries/test_data/src/test/assets/media/dash/ttml-in-mp4/sample.video.mp4 b/libraries/test_data/src/test/assets/media/dash/standalone-ttml/sample.video.mp4 similarity index 100% rename from libraries/test_data/src/test/assets/media/dash/ttml-in-mp4/sample.video.mp4 rename to libraries/test_data/src/test/assets/media/dash/standalone-ttml/sample.video.mp4 diff --git a/libraries/test_data/src/test/assets/media/dash/ttml-in-mp4/sample.xml b/libraries/test_data/src/test/assets/media/dash/standalone-ttml/sample.xml similarity index 100% rename from libraries/test_data/src/test/assets/media/dash/ttml-in-mp4/sample.xml rename to libraries/test_data/src/test/assets/media/dash/standalone-ttml/sample.xml diff --git a/libraries/test_data/src/test/assets/playbackdumps/dash/ttml-in-mp4.dump b/libraries/test_data/src/test/assets/playbackdumps/dash/standalone-ttml.dump similarity index 100% rename from libraries/test_data/src/test/assets/playbackdumps/dash/ttml-in-mp4.dump rename to libraries/test_data/src/test/assets/playbackdumps/dash/standalone-ttml.dump