Skip to content

Commit

Permalink
refactor: rename master manifest to main manifest (#141)
Browse files Browse the repository at this point in the history
  • Loading branch information
gesinger authored Jul 27, 2021
1 parent 1601467 commit 5720fbd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/segment/segmentBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const segmentsFromBase = (attributes) => {
export const addSidxSegmentsToPlaylist = (playlist, sidx, baseUrl) => {
// Retain init segment information
const initSegment = playlist.sidx.map ? playlist.sidx.map : null;
// Retain source duration from initial master manifest parsing
// Retain source duration from initial main manifest parsing
const sourceDuration = playlist.sidx.duration;
// Retain source timeline
const timeline = playlist.timeline || 0;
Expand Down
21 changes: 11 additions & 10 deletions src/toM3u8.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ export const toM3u8 = (dashPlaylists, locations, sidxMapping = {}) => {
return {};
}

// grab all master attributes
// grab all main manifest attributes
const {
sourceDuration: duration,
type,
Expand All @@ -293,7 +293,7 @@ export const toM3u8 = (dashPlaylists, locations, sidxMapping = {}) => {
const vttPlaylists = dashPlaylists.filter(vttOnly);
const captions = dashPlaylists.map((playlist) => playlist.attributes.captionServices).filter(Boolean);

const master = {
const manifest = {
allowCache: true,
discontinuityStarts: [],
segments: [],
Expand All @@ -310,30 +310,31 @@ export const toM3u8 = (dashPlaylists, locations, sidxMapping = {}) => {
};

if (minimumUpdatePeriod >= 0) {
master.minimumUpdatePeriod = minimumUpdatePeriod * 1000;
manifest.minimumUpdatePeriod = minimumUpdatePeriod * 1000;
}

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

if (type === 'dynamic') {
master.suggestedPresentationDelay = suggestedPresentationDelay;
manifest.suggestedPresentationDelay = suggestedPresentationDelay;
}

const isAudioOnly = master.playlists.length === 0;
const isAudioOnly = manifest.playlists.length === 0;

if (audioPlaylists.length) {
master.mediaGroups.AUDIO.audio = organizeAudioPlaylists(audioPlaylists, sidxMapping, isAudioOnly);
manifest.mediaGroups.AUDIO.audio =
organizeAudioPlaylists(audioPlaylists, sidxMapping, isAudioOnly);
}

if (vttPlaylists.length) {
master.mediaGroups.SUBTITLES.subs = organizeVttPlaylists(vttPlaylists, sidxMapping);
manifest.mediaGroups.SUBTITLES.subs = organizeVttPlaylists(vttPlaylists, sidxMapping);
}

if (captions.length) {
master.mediaGroups['CLOSED-CAPTIONS'].cc = organizeCaptionServices(captions);
manifest.mediaGroups['CLOSED-CAPTIONS'].cc = organizeCaptionServices(captions);
}

return master;
return manifest;
};

0 comments on commit 5720fbd

Please sign in to comment.