Skip to content

Commit

Permalink
feat: parse out Location elements (#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
gkatsev committed Aug 12, 2020
1 parent 1fd952c commit 967e5e6
Show file tree
Hide file tree
Showing 10 changed files with 575 additions and 382 deletions.
8 changes: 6 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@ import { parseUTCTimingScheme } from './parseUTCTimingScheme';

const VERSION = version;

const parse = (manifestString, options = {}) =>
toM3u8(toPlaylists(inheritAttributes(stringToMpdXml(manifestString), options)), options.sidxMapping);
const parse = (manifestString, options = {}) => {
const parsedManifestInfo = inheritAttributes(stringToMpdXml(manifestString), options);
const playlists = toPlaylists(parsedManifestInfo.representationInfo);

return toM3u8(playlists, parsedManifestInfo.locations, options.sidxMapping);
};

/**
* Parses the manifest for a UTCTiming node, returning the nodes attributes if found
Expand Down
11 changes: 10 additions & 1 deletion src/inheritAttributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,21 @@ export const inheritAttributes = (mpd, options = {}) => {
throw new Error(errors.INVALID_NUMBER_OF_PERIOD);
}

const locations = findChildren(mpd, 'Location');

const mpdAttributes = parseAttributes(mpd);
const mpdBaseUrls = buildBaseUrls([ manifestUri ], findChildren(mpd, 'BaseURL'));

mpdAttributes.sourceDuration = mpdAttributes.mediaPresentationDuration || 0;
mpdAttributes.NOW = NOW;
mpdAttributes.clientOffset = clientOffset;

return flatten(periods.map(toAdaptationSets(mpdAttributes, mpdBaseUrls)));
if (locations.length) {
mpdAttributes.locations = locations.map(getContent);
}

return {
locations: mpdAttributes.locations,
representationInfo: flatten(periods.map(toAdaptationSets(mpdAttributes, mpdBaseUrls)))
};
};
6 changes: 5 additions & 1 deletion src/toM3u8.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export const formatVideoPlaylist = ({ attributes, segments, sidx }) => {
return playlist;
};

export const toM3u8 = (dashPlaylists, sidxMapping = {}) => {
export const toM3u8 = (dashPlaylists, locations, sidxMapping = {}) => {
if (!dashPlaylists.length) {
return {};
}
Expand Down Expand Up @@ -272,6 +272,10 @@ export const toM3u8 = (dashPlaylists, sidxMapping = {}) => {
minimumUpdatePeriod: minimumUpdatePeriod * 1000
};

if (locations) {
master.locations = locations;
}

if (type === 'dynamic') {
master.suggestedPresentationDelay = suggestedPresentationDelay;
}
Expand Down
16 changes: 16 additions & 0 deletions test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import QUnit from 'qunit';
import maatVttSegmentTemplate from './manifests/maat_vtt_segmentTemplate.mpd';
import segmentBaseTemplate from './manifests/segmentBase.mpd';
import segmentListTemplate from './manifests/segmentList.mpd';
import locationTemplate from './manifests/location.mpd';
import locationsTemplate from './manifests/locations.mpd';
import multiperiod from './manifests/multiperiod.mpd';
import multiperiodDynamic from './manifests/multiperiod-dynamic.mpd';
import {
Expand All @@ -22,6 +24,12 @@ import {
import {
parsedManifest as multiperiodDynamicManifest
} from './manifests/multiperiod-dynamic.js';
import {
parsedManifest as locationManifest
} from './manifests/location.js';
import {
parsedManifest as locationsManifest
} from './manifests/locations.js';

QUnit.module('mpd-parser');

Expand Down Expand Up @@ -53,6 +61,14 @@ QUnit.test('has parse', function(assert) {
name: 'multiperiod_dynamic',
input: multiperiodDynamic,
expected: multiperiodDynamicManifest
}, {
name: 'location',
input: locationTemplate,
expected: locationManifest
}, {
name: 'locations',
input: locationsTemplate,
expected: locationsManifest
}].forEach(({ name, input, expected }) => {
QUnit.test(`${name} test manifest`, function(assert) {
const actual = parse(input);
Expand Down
Loading

0 comments on commit 967e5e6

Please sign in to comment.