Skip to content
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.

Sign up for GitHub

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

Jump to bottom

refactor: rename master manifest to main manifest #141

Merged
merged 1 commit into from
Jul 27, 2021
Merged

refactor: rename master manifest to main manifest #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/segment/segmentBase.js
View file
Open in desktop
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
View file
Open in desktop
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;
};