Skip to content

SDK / exoplayer

Go to a project
Commit e377e13d by olly Committed by Oliver Woodman
Options

Clean up DashManifestParserTest 

Also improve some tests by asserting the parser is left in
the correct position (assertNextTag).

PiperOrigin-RevId: 272614768
parent fbb47156
Inline Side-by-side
Showing with 99 additions and 87 deletions
library/dash/src/test/assets/sample_mpd_1 → library/dash/src/test/assets/sample_mpd
...@@ -102,4 +102,3 @@ http://www.test.com/vtt ...@@ -102,4 +102,3 @@ http://www.test.com/vtt
</AdaptationSet> </AdaptationSet>
</Period> </Period>
</MPD> </MPD>
library/dash/src/test/assets/sample_mpd_4_event_stream → library/dash/src/test/assets/sample_mpd_event_stream
...@@ -44,4 +44,3 @@ ...@@ -44,4 +44,3 @@
</AdaptationSet> </AdaptationSet>
</Period> </Period>
</MPD> </MPD>
library/dash/src/test/assets/sample_mpd_3_segment_template → library/dash/src/test/assets/sample_mpd_segment_template
...@@ -35,4 +35,3 @@ ...@@ -35,4 +35,3 @@
</AdaptationSet> </AdaptationSet>
</Period> </Period>
</MPD> </MPD>
library/dash/src/test/assets/sample_mpd_2_unknown_mime_type → library/dash/src/test/assets/sample_mpd_unknown_mime_type
...@@ -115,4 +115,3 @@ http://www.test.com/vtt ...@@ -115,4 +115,3 @@ http://www.test.com/vtt
</AdaptationSet> </AdaptationSet>
</Period> </Period>
</MPD> </MPD>
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
...@@ -40,32 +40,35 @@ import org.xmlpull.v1.XmlPullParserFactory; ...@@ -40,32 +40,35 @@ import org.xmlpull.v1.XmlPullParserFactory;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class DashManifestParserTest { public class DashManifestParserTest {
private static final String SAMPLE_MPD_1 = "sample_mpd_1"; private static final String SAMPLE_MPD = "sample_mpd";
private static final String SAMPLE_MPD_2_UNKNOWN_MIME_TYPE = "sample_mpd_2_unknown_mime_type"; private static final String SAMPLE_MPD_UNKNOWN_MIME_TYPE = "sample_mpd_unknown_mime_type";
private static final String SAMPLE_MPD_3_SEGMENT_TEMPLATE = "sample_mpd_3_segment_template"; private static final String SAMPLE_MPD_SEGMENT_TEMPLATE = "sample_mpd_segment_template";
private static final String SAMPLE_MPD_4_EVENT_STREAM = "sample_mpd_4_event_stream"; private static final String SAMPLE_MPD_EVENT_STREAM = "sample_mpd_event_stream";
private static final String NEXT_TAG_NAME = "Next";
private static final String NEXT_TAG = "<" + NEXT_TAG_NAME + "/>";
/** Simple test to ensure the sample manifests parse without any exceptions being thrown. */ /** Simple test to ensure the sample manifests parse without any exceptions being thrown. */
@Test @Test
public void testParseMediaPresentationDescription() throws IOException { public void parseMediaPresentationDescription() throws IOException {
DashManifestParser parser = new DashManifestParser(); DashManifestParser parser = new DashManifestParser();
parser.parse( parser.parse(
Uri.parse("https://example.com/test.mpd"), Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD_1)); TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD));
parser.parse( parser.parse(
Uri.parse("https://example.com/test.mpd"), Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream( TestUtil.getInputStream(
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_2_UNKNOWN_MIME_TYPE)); ApplicationProvider.getApplicationContext(), SAMPLE_MPD_UNKNOWN_MIME_TYPE));
} }
@Test @Test
public void testParseMediaPresentationDescriptionWithSegmentTemplate() throws IOException { public void parseMediaPresentationDescription_segmentTemplate() throws IOException {
DashManifestParser parser = new DashManifestParser(); DashManifestParser parser = new DashManifestParser();
DashManifest mpd = DashManifest mpd =
parser.parse( parser.parse(
Uri.parse("https://example.com/test.mpd"), Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream( TestUtil.getInputStream(
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_3_SEGMENT_TEMPLATE)); ApplicationProvider.getApplicationContext(), SAMPLE_MPD_SEGMENT_TEMPLATE));
assertThat(mpd.getPeriodCount()).isEqualTo(1); assertThat(mpd.getPeriodCount()).isEqualTo(1);
...@@ -91,13 +94,13 @@ public class DashManifestParserTest { ...@@ -91,13 +94,13 @@ public class DashManifestParserTest {
} }
@Test @Test
public void testParseMediaPresentationDescriptionCanParseEventStream() throws IOException { public void parseMediaPresentationDescription_eventStream() throws IOException {
DashManifestParser parser = new DashManifestParser(); DashManifestParser parser = new DashManifestParser();
DashManifest mpd = DashManifest mpd =
parser.parse( parser.parse(
Uri.parse("https://example.com/test.mpd"), Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream( TestUtil.getInputStream(
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_4_EVENT_STREAM)); ApplicationProvider.getApplicationContext(), SAMPLE_MPD_EVENT_STREAM));
Period period = mpd.getPeriod(0); Period period = mpd.getPeriod(0);
assertThat(period.eventStreams).hasSize(3); assertThat(period.eventStreams).hasSize(3);
...@@ -161,12 +164,12 @@ public class DashManifestParserTest { ...@@ -161,12 +164,12 @@ public class DashManifestParserTest {
} }
@Test @Test
public void testParseMediaPresentationDescriptionCanParseProgramInformation() throws IOException { public void parseMediaPresentationDescription_programInformation() throws IOException {
DashManifestParser parser = new DashManifestParser(); DashManifestParser parser = new DashManifestParser();
DashManifest mpd = DashManifest mpd =
parser.parse( parser.parse(
Uri.parse("Https://example.com/test.mpd"), Uri.parse("Https://example.com/test.mpd"),
TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD_1)); TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD));
ProgramInformation expectedProgramInformation = ProgramInformation expectedProgramInformation =
new ProgramInformation( new ProgramInformation(
"MediaTitle", "MediaSource", "MediaCopyright", "www.example.com", "enUs"); "MediaTitle", "MediaSource", "MediaCopyright", "www.example.com", "enUs");
...@@ -174,7 +177,82 @@ public class DashManifestParserTest { ...@@ -174,7 +177,82 @@ public class DashManifestParserTest {
} }
@Test @Test
public void testParseCea608AccessibilityChannel() { public void parseSegmentTimeline_repeatCount() throws Exception {
DashManifestParser parser = new DashManifestParser();
XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
xpp.setInput(
new StringReader(
"<SegmentTimeline><S d=\"96000\" r=\"2\"/><S d=\"48000\" r=\"0\"/></SegmentTimeline>"
+ NEXT_TAG));
xpp.next();
List<SegmentTimelineElement> elements =
parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
assertThat(elements)
.containsExactly(
new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 48000))
.inOrder();
assertNextTag(xpp);
}
@Test
public void parseSegmentTimeline_singleUndefinedRepeatCount() throws Exception {
DashManifestParser parser = new DashManifestParser();
XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
xpp.setInput(
new StringReader(
"<SegmentTimeline><S d=\"96000\" r=\"-1\"/></SegmentTimeline>" + NEXT_TAG));
xpp.next();
List<SegmentTimelineElement> elements =
parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
assertThat(elements)
.containsExactly(
new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 384000, /* duration= */ 96000))
.inOrder();
assertNextTag(xpp);
}
@Test
public void parseSegmentTimeline_timeOffsetsAndUndefinedRepeatCount() throws Exception {
DashManifestParser parser = new DashManifestParser();
XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
xpp.setInput(
new StringReader(
"<SegmentTimeline><S t=\"0\" "
+ "d=\"96000\" r=\"-1\"/><S t=\"192000\" d=\"48000\" r=\"-1\"/>"
+ "</SegmentTimeline>"
+ NEXT_TAG));
xpp.next();
List<SegmentTimelineElement> elements =
parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
assertThat(elements)
.containsExactly(
new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 240000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 336000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 384000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 432000, /* duration= */ 48000))
.inOrder();
assertNextTag(xpp);
}
@Test
public void parseCea608AccessibilityChannel() {
assertThat( assertThat(
DashManifestParser.parseCea608AccessibilityChannel( DashManifestParser.parseCea608AccessibilityChannel(
buildCea608AccessibilityDescriptors("CC1=eng"))) buildCea608AccessibilityDescriptors("CC1=eng")))
...@@ -215,7 +293,7 @@ public class DashManifestParserTest { ...@@ -215,7 +293,7 @@ public class DashManifestParserTest {
} }
@Test @Test
public void testParseCea708AccessibilityChannel() { public void parseCea708AccessibilityChannel() {
assertThat( assertThat(
DashManifestParser.parseCea708AccessibilityChannel( DashManifestParser.parseCea708AccessibilityChannel(
buildCea708AccessibilityDescriptors("1=lang:eng"))) buildCea708AccessibilityDescriptors("1=lang:eng")))
...@@ -259,74 +337,6 @@ public class DashManifestParserTest { ...@@ -259,74 +337,6 @@ public class DashManifestParserTest {
.isEqualTo(Format.NO_VALUE); .isEqualTo(Format.NO_VALUE);
} }
@Test
public void parseSegmentTimeline_withRepeatCount() throws Exception {
DashManifestParser parser = new DashManifestParser();
XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
xpp.setInput(
new StringReader(
"<SegmentTimeline><S d=\"96000\" r=\"2\"/><S d=\"48000\" r=\"0\"/></SegmentTimeline>"));
xpp.next();
List<SegmentTimelineElement> elements =
parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
assertThat(elements)
.containsExactly(
new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 48000))
.inOrder();
}
@Test
public void parseSegmentTimeline_withSingleUndefinedRepeatCount() throws Exception {
DashManifestParser parser = new DashManifestParser();
XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
xpp.setInput(new StringReader("<SegmentTimeline><S d=\"96000\" r=\"-1\"/></SegmentTimeline>"));
xpp.next();
List<SegmentTimelineElement> elements =
parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
assertThat(elements)
.containsExactly(
new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 384000, /* duration= */ 96000))
.inOrder();
}
@Test
public void parseSegmentTimeline_withTimeOffsetsAndUndefinedRepeatCount() throws Exception {
DashManifestParser parser = new DashManifestParser();
XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
xpp.setInput(
new StringReader(
"<SegmentTimeline><S t=\"0\" "
+ "d=\"96000\" r=\"-1\"/><S t=\"192000\" d=\"48000\" r=\"-1\"/>"
+ "</SegmentTimeline>"));
xpp.next();
List<SegmentTimelineElement> elements =
parser.parseSegmentTimeline(xpp, /* timescale= */ 48000, /* periodDurationMs= */ 10000);
assertThat(elements)
.containsExactly(
new SegmentTimelineElement(/* startTime= */ 0, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 96000, /* duration= */ 96000),
new SegmentTimelineElement(/* startTime= */ 192000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 240000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 288000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 336000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 384000, /* duration= */ 48000),
new SegmentTimelineElement(/* startTime= */ 432000, /* duration= */ 48000))
.inOrder();
}
private static List<Descriptor> buildCea608AccessibilityDescriptors(String value) { private static List<Descriptor> buildCea608AccessibilityDescriptors(String value) {
return Collections.singletonList(new Descriptor("urn:scte:dash:cc:cea-608:2015", value, null)); return Collections.singletonList(new Descriptor("urn:scte:dash:cc:cea-608:2015", value, null));
} }
...@@ -334,4 +344,10 @@ public class DashManifestParserTest { ...@@ -334,4 +344,10 @@ public class DashManifestParserTest {
private static List<Descriptor> buildCea708AccessibilityDescriptors(String value) { private static List<Descriptor> buildCea708AccessibilityDescriptors(String value) {
return Collections.singletonList(new Descriptor("urn:scte:dash:cc:cea-708:2015", value, null)); return Collections.singletonList(new Descriptor("urn:scte:dash:cc:cea-708:2015", value, null));
} }
private static void assertNextTag(XmlPullParser xpp) throws Exception {
xpp.next();
assertThat(xpp.getEventType()).isEqualTo(XmlPullParser.START_TAG);
assertThat(xpp.getName()).isEqualTo(NEXT_TAG_NAME);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment