diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java index 2bdf72b3a5..728a164b11 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java @@ -51,7 +51,8 @@ public final class PsDurationReaderTest { FakeExtractorInput input = new FakeExtractorInput.Builder() .setData( - TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ps")) + TestUtil.getByteArray( + ApplicationProvider.getApplicationContext(), "ts/sample_h262_mpeg_audio.ps")) .build(); int result = Extractor.RESULT_CONTINUE; @@ -70,7 +71,8 @@ public final class PsDurationReaderTest { FakeExtractorInput input = new FakeExtractorInput.Builder() .setData( - TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), "ts/sample.ps")) + TestUtil.getByteArray( + ApplicationProvider.getApplicationContext(), "ts/sample_h262_mpeg_audio.ps")) .build(); input.setPosition(1234); diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java index 085c102918..c9e9dce471 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java @@ -25,7 +25,12 @@ import org.junit.runner.RunWith; public final class PsExtractorTest { @Test - public void sample() throws Exception { - ExtractorAsserts.assertBehavior(PsExtractor::new, "ts/sample.ps"); + public void sampleWithH262AndMpegAudio() throws Exception { + ExtractorAsserts.assertBehavior(PsExtractor::new, "ts/sample_h262_mpeg_audio.ps"); + } + + @Test + public void sampleWithAc3() throws Exception { + ExtractorAsserts.assertBehavior(PsExtractor::new, "ts/sample_ac3.ps"); } } diff --git a/testdata/src/test/assets/ts/sample_ac3.ps b/testdata/src/test/assets/ts/sample_ac3.ps new file mode 100644 index 0000000000..a255996824 Binary files /dev/null and b/testdata/src/test/assets/ts/sample_ac3.ps differ diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.0.dump b/testdata/src/test/assets/ts/sample_ac3.ps.0.dump new file mode 100644 index 0000000000..27d0c450fd --- /dev/null +++ b/testdata/src/test/assets/ts/sample_ac3.ps.0.dump @@ -0,0 +1,29 @@ +seekMap: + isSeekable = true + duration = 0 + getPosition(0) = [[timeUs=0, position=0]] + getPosition(1) = [[timeUs=1, position=0]] + getPosition(0) = [[timeUs=0, position=0]] + getPosition(0) = [[timeUs=0, position=0]] +numberOfTracks = 1 +track 189: + total output bytes = 1252 + sample count = 3 + format 0: + id = 189 + sampleMimeType = audio/ac3 + channelCount = 1 + sampleRate = 44100 + sample 0: + time = 0 + flags = 1 + data = length 416, hash 6B14E268 + sample 1: + time = 34829 + flags = 1 + data = length 418, hash BC27DF0B + sample 2: + time = 69658 + flags = 1 + data = length 418, hash BC27DF0B +tracksEnded = false diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.1.dump b/testdata/src/test/assets/ts/sample_ac3.ps.1.dump new file mode 100644 index 0000000000..27d0c450fd --- /dev/null +++ b/testdata/src/test/assets/ts/sample_ac3.ps.1.dump @@ -0,0 +1,29 @@ +seekMap: + isSeekable = true + duration = 0 + getPosition(0) = [[timeUs=0, position=0]] + getPosition(1) = [[timeUs=1, position=0]] + getPosition(0) = [[timeUs=0, position=0]] + getPosition(0) = [[timeUs=0, position=0]] +numberOfTracks = 1 +track 189: + total output bytes = 1252 + sample count = 3 + format 0: + id = 189 + sampleMimeType = audio/ac3 + channelCount = 1 + sampleRate = 44100 + sample 0: + time = 0 + flags = 1 + data = length 416, hash 6B14E268 + sample 1: + time = 34829 + flags = 1 + data = length 418, hash BC27DF0B + sample 2: + time = 69658 + flags = 1 + data = length 418, hash BC27DF0B +tracksEnded = false diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.2.dump b/testdata/src/test/assets/ts/sample_ac3.ps.2.dump new file mode 100644 index 0000000000..27d0c450fd --- /dev/null +++ b/testdata/src/test/assets/ts/sample_ac3.ps.2.dump @@ -0,0 +1,29 @@ +seekMap: + isSeekable = true + duration = 0 + getPosition(0) = [[timeUs=0, position=0]] + getPosition(1) = [[timeUs=1, position=0]] + getPosition(0) = [[timeUs=0, position=0]] + getPosition(0) = [[timeUs=0, position=0]] +numberOfTracks = 1 +track 189: + total output bytes = 1252 + sample count = 3 + format 0: + id = 189 + sampleMimeType = audio/ac3 + channelCount = 1 + sampleRate = 44100 + sample 0: + time = 0 + flags = 1 + data = length 416, hash 6B14E268 + sample 1: + time = 34829 + flags = 1 + data = length 418, hash BC27DF0B + sample 2: + time = 69658 + flags = 1 + data = length 418, hash BC27DF0B +tracksEnded = false diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.3.dump b/testdata/src/test/assets/ts/sample_ac3.ps.3.dump new file mode 100644 index 0000000000..27d0c450fd --- /dev/null +++ b/testdata/src/test/assets/ts/sample_ac3.ps.3.dump @@ -0,0 +1,29 @@ +seekMap: + isSeekable = true + duration = 0 + getPosition(0) = [[timeUs=0, position=0]] + getPosition(1) = [[timeUs=1, position=0]] + getPosition(0) = [[timeUs=0, position=0]] + getPosition(0) = [[timeUs=0, position=0]] +numberOfTracks = 1 +track 189: + total output bytes = 1252 + sample count = 3 + format 0: + id = 189 + sampleMimeType = audio/ac3 + channelCount = 1 + sampleRate = 44100 + sample 0: + time = 0 + flags = 1 + data = length 416, hash 6B14E268 + sample 1: + time = 34829 + flags = 1 + data = length 418, hash BC27DF0B + sample 2: + time = 69658 + flags = 1 + data = length 418, hash BC27DF0B +tracksEnded = false diff --git a/testdata/src/test/assets/ts/sample_ac3.ps.unknown_length.dump b/testdata/src/test/assets/ts/sample_ac3.ps.unknown_length.dump new file mode 100644 index 0000000000..960882156b --- /dev/null +++ b/testdata/src/test/assets/ts/sample_ac3.ps.unknown_length.dump @@ -0,0 +1,26 @@ +seekMap: + isSeekable = false + duration = UNSET TIME + getPosition(0) = [[timeUs=0, position=0]] +numberOfTracks = 1 +track 189: + total output bytes = 1252 + sample count = 3 + format 0: + id = 189 + sampleMimeType = audio/ac3 + channelCount = 1 + sampleRate = 44100 + sample 0: + time = 0 + flags = 1 + data = length 416, hash 6B14E268 + sample 1: + time = 34829 + flags = 1 + data = length 418, hash BC27DF0B + sample 2: + time = 69658 + flags = 1 + data = length 418, hash BC27DF0B +tracksEnded = false diff --git a/testdata/src/test/assets/ts/sample.ps b/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps similarity index 100% rename from testdata/src/test/assets/ts/sample.ps rename to testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps diff --git a/testdata/src/test/assets/ts/sample.ps.0.dump b/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.0.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ps.0.dump rename to testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.0.dump diff --git a/testdata/src/test/assets/ts/sample.ps.1.dump b/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.1.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ps.1.dump rename to testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.1.dump diff --git a/testdata/src/test/assets/ts/sample.ps.2.dump b/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.2.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ps.2.dump rename to testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.2.dump diff --git a/testdata/src/test/assets/ts/sample.ps.3.dump b/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.3.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ps.3.dump rename to testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.3.dump diff --git a/testdata/src/test/assets/ts/sample.ps.unknown_length.dump b/testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.unknown_length.dump similarity index 100% rename from testdata/src/test/assets/ts/sample.ps.unknown_length.dump rename to testdata/src/test/assets/ts/sample_h262_mpeg_audio.ps.unknown_length.dump