Skip to content

SDK / exoplayer

Go to a project
Commit 2d0d4c78 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 e3468560
Inline Side-by-side
Showing with 99 additions and 19 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
</AdaptationSet>
</Period>
</MPD>
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
......@@ -36,32 +36,35 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class DashManifestParserTest {
private static final String SAMPLE_MPD_1 = "sample_mpd_1";
private static final String SAMPLE_MPD_2_UNKNOWN_MIME_TYPE = "sample_mpd_2_unknown_mime_type";
private static final String SAMPLE_MPD_3_SEGMENT_TEMPLATE = "sample_mpd_3_segment_template";
private static final String SAMPLE_MPD_4_EVENT_STREAM = "sample_mpd_4_event_stream";
private static final String SAMPLE_MPD = "sample_mpd";
private static final String SAMPLE_MPD_UNKNOWN_MIME_TYPE = "sample_mpd_unknown_mime_type";
private static final String SAMPLE_MPD_SEGMENT_TEMPLATE = "sample_mpd_segment_template";
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. */
@Test
public void testParseMediaPresentationDescription() throws IOException {
public void parseMediaPresentationDescription() throws IOException {
DashManifestParser parser = new DashManifestParser();
parser.parse(
Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD_1));
TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD));
parser.parse(
Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream(
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_2_UNKNOWN_MIME_TYPE));
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_UNKNOWN_MIME_TYPE));
}
@Test
public void testParseMediaPresentationDescriptionWithSegmentTemplate() throws IOException {
public void parseMediaPresentationDescription_segmentTemplate() throws IOException {
DashManifestParser parser = new DashManifestParser();
DashManifest mpd =
parser.parse(
Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream(
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_3_SEGMENT_TEMPLATE));
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_SEGMENT_TEMPLATE));
assertThat(mpd.getPeriodCount()).isEqualTo(1);
......@@ -87,13 +90,13 @@ public class DashManifestParserTest {
}
@Test
public void testParseMediaPresentationDescriptionCanParseEventStream() throws IOException {
public void parseMediaPresentationDescription_eventStream() throws IOException {
DashManifestParser parser = new DashManifestParser();
DashManifest mpd =
parser.parse(
Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream(
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_4_EVENT_STREAM));
ApplicationProvider.getApplicationContext(), SAMPLE_MPD_EVENT_STREAM));
Period period = mpd.getPeriod(0);
assertThat(period.eventStreams).hasSize(3);
......@@ -157,12 +160,12 @@ public class DashManifestParserTest {
}
@Test
public void testParseMediaPresentationDescriptionCanParseProgramInformation() throws IOException {
public void parseMediaPresentationDescription_programInformation() throws IOException {
DashManifestParser parser = new DashManifestParser();
DashManifest mpd =
parser.parse(
Uri.parse("Https://example.com/test.mpd"),
TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD_1));
TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_MPD));
ProgramInformation expectedProgramInformation =
new ProgramInformation(
"MediaTitle", "MediaSource", "MediaCopyright", "www.example.com", "enUs");
......@@ -170,7 +173,82 @@ public class DashManifestParserTest {
}
@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(
DashManifestParser.parseCea608AccessibilityChannel(
buildCea608AccessibilityDescriptors("CC1=eng")))
......@@ -211,7 +289,7 @@ public class DashManifestParserTest {
}
@Test
public void testParseCea708AccessibilityChannel() {
public void parseCea708AccessibilityChannel() {
assertThat(
DashManifestParser.parseCea708AccessibilityChannel(
buildCea708AccessibilityDescriptors("1=lang:eng")))
......@@ -262,4 +340,10 @@ public class DashManifestParserTest {
private static List<Descriptor> buildCea708AccessibilityDescriptors(String value) {
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