loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename test.mp3 test asset to test-cbr-info-header.mp3

Browse Source 
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
This commit is contained in:
ibaker 2024-01-05 02:28:30 -08:00 committed by Copybara-Service
parent 95e742948c
commit 62f6c64a91
9 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/EndToEndGaplessTest.java
View File

@ -93,8 +93,8 @@ public class EndToEndGaplessTest {
player.setMediaItems( player.setMediaItems(
ImmutableList.of( ImmutableList.of(
MediaItem.fromUri("asset:///media/mp3/test.mp3"), MediaItem.fromUri("asset:///media/mp3/test-cbr-info-header.mp3"),
MediaItem.fromUri("asset:///media/mp3/test.mp3"))); MediaItem.fromUri("asset:///media/mp3/test-cbr-info-header.mp3")));
player.prepare(); player.prepare();
player.play(); player.play();
TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED); TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED);

2
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp3PlaybackTest.java
View File

@ -45,7 +45,7 @@ public final class Mp3PlaybackTest {
"bear-vbr-no-seek-table.mp3", "bear-vbr-no-seek-table.mp3",
"bear-vbr-xing-header.mp3", "bear-vbr-xing-header.mp3",
"play-trimmed.mp3", "play-trimmed.mp3",
"test.mp3"); "test-cbr-info-header.mp3");
} }
@ParameterizedRobolectricTestRunner.Parameter public String inputFile; @ParameterizedRobolectricTestRunner.Parameter public String inputFile;

4
libraries/extractor/src/test/java/androidx/media3/extractor/DefaultExtractorsFactoryTest.java
View File

@ -89,7 +89,7 @@ public final class DefaultExtractorsFactoryTest {
@Test @Test
public void createExtractors_withMediaInfo_startsWithExtractorsMatchingHeadersAndThenUri() { public void createExtractors_withMediaInfo_startsWithExtractorsMatchingHeadersAndThenUri() {
DefaultExtractorsFactory defaultExtractorsFactory = new DefaultExtractorsFactory(); DefaultExtractorsFactory defaultExtractorsFactory = new DefaultExtractorsFactory();
Uri uri = Uri.parse("test.mp3"); Uri uri = Uri.parse("test-cbr-info-header.mp3");
Map<String, List<String>> responseHeaders = new HashMap<>(); Map<String, List<String>> responseHeaders = new HashMap<>();
responseHeaders.put("Content-Type", Collections.singletonList(MimeTypes.VIDEO_MP4)); responseHeaders.put("Content-Type", Collections.singletonList(MimeTypes.VIDEO_MP4));
@ -104,7 +104,7 @@ public final class DefaultExtractorsFactoryTest {
@Test @Test
public void createExtractors_withMediaInfo_optimizesSniffingOrder() { public void createExtractors_withMediaInfo_optimizesSniffingOrder() {
DefaultExtractorsFactory defaultExtractorsFactory = new DefaultExtractorsFactory(); DefaultExtractorsFactory defaultExtractorsFactory = new DefaultExtractorsFactory();
Uri uri = Uri.parse("test.mp3"); Uri uri = Uri.parse("test-cbr-info-header.mp3");
Map<String, List<String>> responseHeaders = new HashMap<>(); Map<String, List<String>> responseHeaders = new HashMap<>();
responseHeaders.put("Content-Type", Collections.singletonList(MimeTypes.VIDEO_MP4)); responseHeaders.put("Content-Type", Collections.singletonList(MimeTypes.VIDEO_MP4));

0
libraries/test_data/src/test/assets/media/mp3/test.mp3 → libraries/test_data/src/test/assets/media/mp3/test-cbr-info-header.mp3
View File

0
libraries/test_data/src/test/assets/playbackdumps/mp3/test.mp3.dump → libraries/test_data/src/test/assets/playbackdumps/mp3/test-cbr-info-header.mp3.dump
View File

0
libraries/test_data/src/test/assets/transformerdumps/mp3/test.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump → libraries/test_data/src/test/assets/transformerdumps/mp3/test-cbr-info-header.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump
View File

0
libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test.mp3.dump → libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test-cbr-info-header.mp3.dump
View File

2
libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java
View File

@ -563,7 +563,7 @@ public final class AndroidTestUtil {
.setCodecs("hvc1.1.6.L183.B0") .setCodecs("hvc1.1.6.L183.B0")
.build(); .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 * Creates the GL objects needed to set up a GL environment including an {@link EGLDisplay} and an

2
libraries/transformer/src/test/java/androidx/media3/transformer/TestUtil.java
View File

@ -39,7 +39,7 @@ public final class TestUtil {
public static final String ASSET_URI_PREFIX = "asset:///media/"; 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_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 = "mp4/sample.mp4";
public static final String FILE_AUDIO_VIDEO_STEREO = "mp4/testvid_1022ms.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"; public static final String FILE_AUDIO_RAW_VIDEO = "mp4/sowt-with-video.mov";