From 62f6c64a910f2d925b16cbbacd5f2508892c76e2 Mon Sep 17 00:00:00 2001 From: ibaker Date: Fri, 5 Jan 2024 02:28:30 -0800 Subject: [PATCH] Rename `test.mp3` test asset to `test-cbr-info-header.mp3` This file is CBR encoded with LAME, so it has an `Info` header (the CBR equivalent to `Xing`). A follow-up change will use this file in `Mp3ExtractorTest`. Issue: androidx/media#878 PiperOrigin-RevId: 595938327 --- .../exoplayer/e2etest/EndToEndGaplessTest.java | 4 ++-- .../media3/exoplayer/e2etest/Mp3PlaybackTest.java | 2 +- .../extractor/DefaultExtractorsFactoryTest.java | 4 ++-- .../mp3/{test.mp3 => test-cbr-info-header.mp3} | Bin ...{test.mp3.dump => test-cbr-info-header.mp3.dump} | 0 ...oping_mixedWith_sample_18byte_nclx_colr.mp4.dump | 0 ...looping_mixedWith_test-cbr-info-header.mp3.dump} | 0 .../media3/transformer/AndroidTestUtil.java | 2 +- .../java/androidx/media3/transformer/TestUtil.java | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename libraries/test_data/src/test/assets/media/mp3/{test.mp3 => test-cbr-info-header.mp3} (100%) rename libraries/test_data/src/test/assets/playbackdumps/mp3/{test.mp3.dump => test-cbr-info-header.mp3.dump} (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp3/{test.mp3 => test-cbr-info-header.mp3}/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump (100%) rename libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/{looping_mixedWith_test.mp3.dump => looping_mixedWith_test-cbr-info-header.mp3.dump} (100%) diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndGaplessTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndGaplessTest.java index ddbfbbecfa..14c161c57d 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndGaplessTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndGaplessTest.java @@ -93,8 +93,8 @@ public class EndToEndGaplessTest { player.setMediaItems( ImmutableList.of( - MediaItem.fromUri("asset:///media/mp3/test.mp3"), - MediaItem.fromUri("asset:///media/mp3/test.mp3"))); + MediaItem.fromUri("asset:///media/mp3/test-cbr-info-header.mp3"), + MediaItem.fromUri("asset:///media/mp3/test-cbr-info-header.mp3"))); player.prepare(); player.play(); TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED); diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java index f4f5befdcb..14e9348683 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java @@ -45,7 +45,7 @@ public final class Mp3PlaybackTest { "bear-vbr-no-seek-table.mp3", "bear-vbr-xing-header.mp3", "play-trimmed.mp3", - "test.mp3"); + "test-cbr-info-header.mp3"); } @ParameterizedRobolectricTestRunner.Parameter public String inputFile; diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java index 3c44d18b43..3564027dff 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java @@ -89,7 +89,7 @@ public final class DefaultExtractorsFactoryTest { @Test public void createExtractors_withMediaInfo_startsWithExtractorsMatchingHeadersAndThenUri() { DefaultExtractorsFactory defaultExtractorsFactory = new DefaultExtractorsFactory(); - Uri uri = Uri.parse("test.mp3"); + Uri uri = Uri.parse("test-cbr-info-header.mp3"); Map> responseHeaders = new HashMap<>(); responseHeaders.put("Content-Type", Collections.singletonList(MimeTypes.VIDEO_MP4)); @@ -104,7 +104,7 @@ public final class DefaultExtractorsFactoryTest { @Test public void createExtractors_withMediaInfo_optimizesSniffingOrder() { DefaultExtractorsFactory defaultExtractorsFactory = new DefaultExtractorsFactory(); - Uri uri = Uri.parse("test.mp3"); + Uri uri = Uri.parse("test-cbr-info-header.mp3"); Map> responseHeaders = new HashMap<>(); responseHeaders.put("Content-Type", Collections.singletonList(MimeTypes.VIDEO_MP4)); diff --git a/libraries/test_data/src/test/assets/media/mp3/test.mp3 b/libraries/test_data/src/test/assets/media/mp3/test-cbr-info-header.mp3 similarity index 100% rename from libraries/test_data/src/test/assets/media/mp3/test.mp3 rename to libraries/test_data/src/test/assets/media/mp3/test-cbr-info-header.mp3 diff --git a/libraries/test_data/src/test/assets/playbackdumps/mp3/test.mp3.dump b/libraries/test_data/src/test/assets/playbackdumps/mp3/test-cbr-info-header.mp3.dump similarity index 100% rename from libraries/test_data/src/test/assets/playbackdumps/mp3/test.mp3.dump rename to libraries/test_data/src/test/assets/playbackdumps/mp3/test-cbr-info-header.mp3.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp3/test.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump b/libraries/test_data/src/test/assets/transformerdumps/mp3/test-cbr-info-header.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp3/test.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp3/test-cbr-info-header.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test.mp3.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test-cbr-info-header.mp3.dump similarity index 100% rename from libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test.mp3.dump rename to libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test-cbr-info-header.mp3.dump 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 263315cd7d..2f5d7498d1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java @@ -563,7 +563,7 @@ public final class AndroidTestUtil { .setCodecs("hvc1.1.6.L183.B0") .build(); - public static final String MP3_ASSET_URI_STRING = "asset:///media/mp3/test.mp3"; + public static final String MP3_ASSET_URI_STRING = "asset:///media/mp3/test-cbr-info-header.mp3"; /** * Creates the GL objects needed to set up a GL environment including an {@link EGLDisplay} and an diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java b/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java index 2355529a4c..751baad79e 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java @@ -39,7 +39,7 @@ public final class TestUtil { public static final String ASSET_URI_PREFIX = "asset:///media/"; public static final String FILE_VIDEO_ONLY = "mp4/sample_18byte_nclx_colr.mp4"; - public static final String FILE_AUDIO_ONLY = "mp3/test.mp3"; + public static final String FILE_AUDIO_ONLY = "mp3/test-cbr-info-header.mp3"; public static final String FILE_AUDIO_VIDEO = "mp4/sample.mp4"; public static final String FILE_AUDIO_VIDEO_STEREO = "mp4/testvid_1022ms.mp4"; public static final String FILE_AUDIO_RAW_VIDEO = "mp4/sowt-with-video.mov";