-
Notifications
You must be signed in to change notification settings - Fork 54
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Parse <SegmentList> and <SegmentBase> #18
Changes from 11 commits
fb9b91a
e31b500
8629106
9e06c2c
6b89e5a
0fa09fc
2a9f36a
1d5b64f
e7469b6
2e4b4ec
4539d9c
9b1aad7
8bb1413
b9f69ad
06cd527
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ import { flatten } from './utils/list'; | |
import { shallowMerge, getAttributes } from './utils/object'; | ||
import { parseDuration } from './utils/time'; | ||
import { findChildren, getContent } from './utils/xml'; | ||
import resolveUrl from './resolveUrl'; | ||
import resolveUrl from './utils/resolveUrl'; | ||
import errors from './errors'; | ||
|
||
/** | ||
|
@@ -50,17 +50,42 @@ export const buildBaseUrls = (referenceUrls, baseUrlElements) => { | |
*/ | ||
export const getSegmentInformation = (adaptationSet) => { | ||
const segmentTemplate = findChildren(adaptationSet, 'SegmentTemplate')[0]; | ||
const segmentTimeline = | ||
segmentTemplate && findChildren(segmentTemplate, 'SegmentTimeline')[0]; | ||
const segmentList = findChildren(adaptationSet, 'SegmentList')[0]; | ||
const segmentUrls = segmentList && findChildren(segmentList, 'SegmentURL') | ||
.map(s => shallowMerge({ tag: 'SegmentURL' }, getAttributes(s))); | ||
const segmentBase = findChildren(adaptationSet, 'SegmentBase')[0]; | ||
const segmentTimelineNode = segmentList || segmentTemplate; | ||
const segmentTimeline = | ||
segmentTimelineNode && findChildren(segmentTimelineNode, 'SegmentTimeline')[0]; | ||
const segmentInitializationNode = segmentList || segmentBase || segmentTemplate; | ||
const segmentInitialization = segmentInitializationNode && | ||
findChildren(segmentInitializationNode, 'Initialization')[0]; | ||
|
||
// SegmentTemplate is handled slightly differently, since it can have both @initialization | ||
// and an <Initialization> node. @initialization can be templated, while the node can have a | ||
// url and range specified. If the <SegmentTemplate> has both @initialization and | ||
// an <Initialization> subelement we opt to override with the node, | ||
// as this interaction is not defined in the spec. | ||
const template = segmentTemplate && getAttributes(segmentTemplate); | ||
|
||
if (template && segmentInitialization) { | ||
template.initialization = getAttributes(segmentInitialization); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it would be good if we can account for the
This way in |
||
} | ||
|
||
return { | ||
template: segmentTemplate && getAttributes(segmentTemplate), | ||
template, | ||
timeline: segmentTimeline && | ||
findChildren(segmentTimeline, 'S').map(s => getAttributes(s)), | ||
list: segmentList && getAttributes(segmentList), | ||
base: segmentBase && getAttributes(segmentBase) | ||
findChildren(segmentTimeline, 'S').map(s => getAttributes(s)), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I know that this line was added by me, including the indentation, but do you mind fixing the indentation here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wonder why the linter didn't catch this one, I think it gave me a warning or error for the indentation under There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ya I'm surprised I added it myself, and didn't catch it myself or with the linter. Its not even lined up with anything ha |
||
list: segmentList && shallowMerge( | ||
getAttributes(segmentList), | ||
{ | ||
segmentUrls, | ||
initialization: getAttributes(segmentInitialization) | ||
}), | ||
base: segmentBase && shallowMerge( | ||
getAttributes(segmentBase), { | ||
initialization: getAttributes(segmentInitialization) | ||
}) | ||
}; | ||
}; | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
import errors from '../errors'; | ||
import urlTypeConverter from './urlType'; | ||
import { parseByDuration } from './timeParser'; | ||
|
||
/** | ||
* Translates SegmentBase into a set of segments. | ||
* (DASH SPEC Section 5.3.9.3.2) contains a set of <SegmentURL> nodes. Each | ||
* node should be translated into segment. | ||
* | ||
* @param {Object} attributes | ||
* Object containing all inherited attributes from parent elements with attribute | ||
* names as keys | ||
* @return {Object.<Array>} list of segments | ||
*/ | ||
export const segmentsFromBase = (attributes) => { | ||
const { | ||
baseUrl, | ||
initialization = {}, | ||
sourceDuration, | ||
timescale = 1, | ||
startNumber = 1, | ||
periodIndex = 0, | ||
indexRange = '', | ||
duration | ||
} = attributes; | ||
|
||
// base url is required for SegmentBase to work, per spec (Section 5.3.9.2.1) | ||
if (!baseUrl) { | ||
throw new Error(errors.NO_BASE_URL); | ||
} | ||
|
||
const initSegment = urlTypeConverter({ | ||
baseUrl, | ||
source: initialization.sourceURL, | ||
range: initialization.range | ||
}); | ||
const segment = urlTypeConverter({ baseUrl, source: baseUrl, range: indexRange }); | ||
|
||
segment.map = initSegment; | ||
|
||
const parsedTimescale = parseInt(timescale, 10); | ||
|
||
// If there is a duration, use it, otherwise use the given duration of the source | ||
// (since SegmentBase is only for one total segment) | ||
if (duration) { | ||
const parsedDuration = parseInt(duration, 10); | ||
const start = parseInt(startNumber, 10); | ||
const segmentTimeInfo = parseByDuration(start, | ||
periodIndex, | ||
parsedTimescale, | ||
parsedDuration, | ||
sourceDuration); | ||
|
||
if (segmentTimeInfo.length >= 1) { | ||
segment.duration = segmentTimeInfo[0].duration; | ||
segment.timeline = segmentTimeInfo[0].timeline; | ||
} | ||
} else if (sourceDuration) { | ||
segment.duration = (sourceDuration / parsedTimescale); | ||
segment.timeline = 0; | ||
} | ||
|
||
return [segment]; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
import { parseByDuration, parseByTimeline } from './timeParser'; | ||
import urlTypeConverter from './urlType'; | ||
import errors from '../errors'; | ||
|
||
/** | ||
* Converts a <SegmentUrl> (of type URLType from the DASH spec 5.3.9.2 Table 14) | ||
* to an object that matches the output of a segment in videojs/mpd-parser | ||
* | ||
* @param {Object} attributes | ||
* Object containing all inherited attributes from parent elements with attribute | ||
* names as keys | ||
* @param {Object} segmentUrl | ||
* <SegmentURL> node to translate into a segment object | ||
* @return {Object} translated segment object | ||
*/ | ||
const SegmentURLToSegmentObject = (attributes, segmentUrl) => { | ||
const { baseUrl, initialization = {} } = attributes; | ||
|
||
const initSegment = urlTypeConverter({ | ||
baseUrl, | ||
source: initialization.sourceURL, | ||
range: initialization.range | ||
}); | ||
|
||
const segment = urlTypeConverter({ | ||
baseUrl, | ||
source: segmentUrl.media, | ||
range: segmentUrl.mediaRange | ||
}); | ||
|
||
segment.map = initSegment; | ||
|
||
return segment; | ||
}; | ||
|
||
/** | ||
* Generates a list of segments using information provided by the SegmentList element | ||
* SegmentList (DASH SPEC Section 5.3.9.3.2) contains a set of <SegmentURL> nodes. Each | ||
* node should be translated into segment. | ||
* | ||
* @param {Object} attributes | ||
* Object containing all inherited attributes from parent elements with attribute | ||
* names as keys | ||
* @param {Object[]|undefined} segmentTimeline | ||
* List of objects representing the attributes of each S element contained within | ||
* the SegmentTimeline element | ||
* @return {Object.<Array>} list of segments | ||
*/ | ||
export const segmentsFromList = (attributes, segmentTimeline) => { | ||
const { | ||
timescale = 1, | ||
duration, | ||
segmentUrls = [], | ||
periodIndex = 0, | ||
startNumber = 1 | ||
} = attributes; | ||
|
||
// Per spec (5.3.9.2.1) no way to determine segment duration OR | ||
// if both SegmentTimeline and @duration are defined, it is outside of spec. | ||
if ((!duration && !segmentTimeline) || | ||
(duration && segmentTimeline)) { | ||
throw new Error(errors.SEGMENT_TIME_UNSPECIFIED); | ||
} | ||
|
||
const parsedTimescale = parseInt(timescale, 10); | ||
const start = parseInt(startNumber, 10); | ||
const segmentUrlMap = segmentUrls.map(segmentUrlObject => | ||
SegmentURLToSegmentObject(attributes, segmentUrlObject)); | ||
let segmentTimeInfo; | ||
|
||
if (duration) { | ||
const parsedDuration = parseInt(duration, 10); | ||
|
||
segmentTimeInfo = parseByDuration(start, | ||
periodIndex, | ||
parsedTimescale, | ||
parsedDuration, | ||
attributes.sourceDuration); | ||
} | ||
|
||
if (segmentTimeline) { | ||
segmentTimeInfo = parseByTimeline(start, | ||
periodIndex, | ||
parsedTimescale, | ||
segmentTimeline, | ||
attributes.sourceDuration); | ||
} | ||
|
||
const segments = segmentTimeInfo.map((segmentTime, index) => { | ||
if (segmentUrlMap[index]) { | ||
const segment = segmentUrlMap[index]; | ||
|
||
segment.timeline = segmentTime.timeline; | ||
segment.duration = segmentTime.duration; | ||
return segment; | ||
} | ||
// Since we're mapping we should get rid of any blank segments (in case | ||
// the given SegmentTimeline is handling for more elements than we have | ||
// SegmentURLs for). | ||
}).filter(segment => segment); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this common/supposed/allowed to happen? What cases cause this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So... this shouldn't happen if the mpd is well constructed. But, let's say you have a segment timeline that defines r=10, but you only have 5 segments listed. We will have too many duration objects for the number of segments we have. I guess we could throw an error, but I felt like handling it and truncating made more sense in this case. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Makes sense. I suppose its either we crash up front, or play what we can parse and just have an incomplete video, which is better than no video |
||
|
||
return segments; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These variable names are a bit misleading.
segmentTimelineNode
andsegmentInitializationNode
are actually the parent nodes of those nodes