sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-26 09:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Patch V3] Support signalling of last segment number via supplemental descriptor in mpd.

Browse source
This commit is contained in:
sr1990 2019-06-22 18:56:06 -07:00 committed by sanil
parent 5b02f92dad
commit 5f6a7fc7f1
2 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View file

@ -242,7 +242,7 @@ public class DashManifestParser extends DefaultHandler
} else if (XmlPullParserUtil.isStartTag(xpp, "SegmentList")) {
segmentBase = parseSegmentList(xpp, null);
} else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTemplate")) {
segmentBase = parseSegmentTemplate(xpp, null,null);
segmentBase = parseSegmentTemplate(xpp, null,null,null);
} else {
maybeSkipTag(xpp);
}
@ -333,7 +333,8 @@ public class DashManifestParser extends DefaultHandler
} else if (XmlPullParserUtil.isStartTag(xpp, "SegmentList")) {
segmentBase = parseSegmentList(xpp, (SegmentList) segmentBase);
} else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTemplate")) {
segmentBase = parseSegmentTemplate(xpp, (SegmentTemplate) segmentBase,supplementalProperties);
segmentBase = parseSegmentTemplate(xpp, (SegmentTemplate) segmentBase,
supplementalProperties,null);
} else if (XmlPullParserUtil.isStartTag(xpp, "InbandEventStream")) {
inbandEventStreams.add(parseDescriptor(xpp, "InbandEventStream"));
} else if (XmlPullParserUtil.isStartTag(xpp)) {
@ -487,7 +488,7 @@ public class DashManifestParser extends DefaultHandler
List<Descriptor> adaptationSetRoleDescriptors,
List<Descriptor> adaptationSetAccessibilityDescriptors,
SegmentBase segmentBase,
ArrayList<Descriptor> parentSupplementalProperties)
ArrayList<Descriptor> adaptationSetSupplementalProperties)
throws XmlPullParserException, IOException {
String id = xpp.getAttributeValue(null, "id");
int bandwidth = parseInt(xpp, "bandwidth", Format.NO_VALUE);
@ -520,7 +521,7 @@ public class DashManifestParser extends DefaultHandler
segmentBase = parseSegmentList(xpp, (SegmentList) segmentBase);
} else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTemplate")) {
segmentBase = parseSegmentTemplate(xpp, (SegmentTemplate) segmentBase,
parentSupplementalProperties);
adaptationSetSupplementalProperties,supplementalProperties);
} else if (XmlPullParserUtil.isStartTag(xpp, "ContentProtection")) {
Pair<String, SchemeData> contentProtection = parseContentProtection(xpp);
if (contentProtection.first != null) {
@ -760,7 +761,8 @@ public class DashManifestParser extends DefaultHandler
}
protected SegmentTemplate parseSegmentTemplate(XmlPullParser xpp, SegmentTemplate parent,
ArrayList<Descriptor> parentSupplementalProperties)
ArrayList<Descriptor> adaptationSetSupplementalProperties,
ArrayList<Descriptor> representationSupplementalProperties)
throws XmlPullParserException, IOException {
long timescale = parseLong(xpp, "timescale", parent != null ? parent.timescale : 1);
long presentationTimeOffset = parseLong(xpp, "presentationTimeOffset",
@ -793,7 +795,18 @@ public class DashManifestParser extends DefaultHandler
return buildSegmentTemplate(initialization, timescale, presentationTimeOffset,
startNumber, duration, timeline, initializationTemplate, mediaTemplate,
parentSupplementalProperties);
adaptationSetSupplementalProperties,representationSupplementalProperties);
}
protected String parseLastSegmentNumberSupplementalProperty
(List<Descriptor> supplementalProperties){
for (Descriptor descriptor : supplementalProperties) {
if (descriptor.schemeIdUri.equalsIgnoreCase
("http://dashif.org/guidelines/last-segment-number")) {
return descriptor.value;
}
}
return null;
}
protected SegmentTemplate buildSegmentTemplate(
@ -804,16 +817,28 @@ public class DashManifestParser extends DefaultHandler
long duration,
List<SegmentTimelineElement> timeline,
UrlTemplate initializationTemplate,
UrlTemplate mediaTemplate,ArrayList<Descriptor> supplementalProperties ) {
UrlTemplate mediaTemplate,ArrayList<Descriptor> adaptationSetSupplementalProperties,
ArrayList<Descriptor> representationSupplementalProperties ) {
if (supplementalProperties != null) {
for (Descriptor descriptor : supplementalProperties) {
if (descriptor.schemeIdUri.equalsIgnoreCase
("http://dashif.org/guidelines/last-segment-number")) {
return new SegmentTemplate(initialization, timescale, presentationTimeOffset,
startNumber, Integer.valueOf(descriptor.value),duration, timeline,
initializationTemplate, mediaTemplate);
}
if (representationSupplementalProperties != null) {
if (parseLastSegmentNumberSupplementalProperty
(representationSupplementalProperties) != null) {
String lastSegment = parseLastSegmentNumberSupplementalProperty
(representationSupplementalProperties);
return new SegmentTemplate(initialization, timescale, presentationTimeOffset,
startNumber, Integer.valueOf(lastSegment),duration, timeline,
initializationTemplate, mediaTemplate);
}
}
if (adaptationSetSupplementalProperties != null) {
if (parseLastSegmentNumberSupplementalProperty(adaptationSetSupplementalProperties) != null)
{
String lastSegment = parseLastSegmentNumberSupplementalProperty
(adaptationSetSupplementalProperties);
return new SegmentTemplate(initialization, timescale, presentationTimeOffset,
startNumber, Integer.valueOf(lastSegment),duration, timeline,
initializationTemplate, mediaTemplate);
}
}

9
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java
View file

@ -140,7 +140,7 @@ public abstract class SegmentBase {
* division of this value and {@code timescale}.
* @param startNumber The sequence number of the first segment.
* @param endNumber The sequence number of the last segment specified by SupplementalProperty
* schemeIdUri="http://dashif.org/guidelines/last-segment-number"
* schemeIdUri="http://dashif.org/guidelines/last-segment-number"
* @param duration The duration of each segment in the case of fixed duration segments. The
* value in seconds is the division of this value and {@code timescale}. If {@code
* segmentTimeline} is non-null then this parameter is ignored.
@ -408,10 +408,10 @@ public abstract class SegmentBase {
@Override
public int getSegmentCount(long periodDurationUs) {
if( endNumber != C.INDEX_UNSET) {
return endNumber;
} else if (segmentTimeline != null) {
if (segmentTimeline != null) {
return segmentTimeline.size();
} else if (endNumber != C.INDEX_UNSET) {
return endNumber - (int) startNumber + 1;
} else if (periodDurationUs != C.TIME_UNSET) {
long durationUs = (duration * C.MICROS_PER_SECOND) / timescale;
return (int) Util.ceilDivide(periodDurationUs, durationUs);
@ -419,7 +419,6 @@ public abstract class SegmentBase {
return DashSegmentIndex.INDEX_UNBOUNDED;
}
}
}
/**