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

Fix: Support Daterange Cue Attribute - Place tag at bottom at all times #51

Merged
merged 13 commits into from
Nov 27, 2024
Merged

Fix: Support Daterange Cue Attribute - Place tag at bottom at all times #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
492fb87
interstitial: handle more attributes and set start-date more accurately
Nfrederiksen Nov 21, 2024
9cf09fe
fix if statement
Nfrederiksen Nov 21, 2024
487c000
update unit tests
Nfrederiksen Nov 25, 2024
31b7735
v0.5.0
Nfrederiksen Nov 25, 2024
0c61c2b
add support for daterange cue tags
Nfrederiksen Nov 27, 2024
e3161bd
Merge branch 'master' into fix/extend-hls-interstitial-tag-insertion
Nfrederiksen Nov 27, 2024
fdfcc72
bump node-m3u8 version and clear unit tests
Nfrederiksen Nov 27, 2024
019cc98
Merge branch 'fix/extend-hls-interstitial-tag-insertion' of https://g…
Nfrederiksen Nov 27, 2024
45fc6a3
test: add more coverage
Nfrederiksen Nov 27, 2024
ab23aeb
test: one more coverage
Nfrederiksen Nov 27, 2024
d2b11a6
test: add even more coverage
Nfrederiksen Nov 27, 2024
4a08df0
5.0.1
birme Nov 26, 2024
6a1f709
Merge branch 'fix/extend-hls-interstitial-tag-insertion' of https://g…
Nfrederiksen Nov 27, 2024
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
125 changes: 105 additions & 20 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,26 @@ const getDummySubtitleSegmentId = () => {
return DUMMY_SUBTITLE_COUNT++;
};

const _parseValidCueValues = (cueStr) => {
if (cueStr.includes(",")) {
const splitCueVals = cueStr.split(",");
if (splitCueVals.length > 0) {
const validVals = [];
for (let cueVal of splitCueVals) {
if (["PRE", "POST", "ONCE"].includes(cueVal)) {
validVals.push(cueVal);
}
}
return validVals.join(",");
}
} else {
if (["PRE", "POST", "ONCE"].includes(cueStr)) {
return cueStr;
}
}
return null;
};

const findNearestGroupAndLang = (_group, _language, _playlist) => {
const groups = Object.keys(_playlist);
let group = groups[0]; // default
Expand Down Expand Up @@ -461,6 +481,16 @@ class HLSSpliceVod {
}

_insertInterstitialAtExtraMedia(offset, id, uri, isAssetList, extraAttrs, startDate, playlists, opts) {

let HAS_CUE_ATTR = false;
if (opts && opts.cue) {
const cueValue = _parseValidCueValues(opts.cue);
if (cueValue) {
extraAttrs += `,CUE="${cueValue}"`;
HAS_CUE_ATTR = true;
}
}

const groups = Object.keys(playlists);
for (let i = 0; i < groups.length; i++) {
const group = groups[i];
Expand All @@ -478,33 +508,70 @@ class HLSSpliceVod {
idx++;
}
}
if (HAS_CUE_ATTR) {
pos = playlist.items.PlaylistItem.length - 1;
}
let durationTag = "";
if (opts && opts.plannedDuration) {
durationTag = `,DURATION=${opts.plannedDuration / 1000}`;
}
if (isAssetList) {
playlist.items.PlaylistItem[idx].set(
"daterange",
`ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-LIST="${uri}"${extraAttrs}`
);

if (HAS_CUE_ATTR) {
if (isAssetList) {
playlist.addPlaylistItem({
daterange: `ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-LIST="${uri}"${extraAttrs}`,
});
} else {
playlist.addPlaylistItem({
daterange: `ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-URI="${uri}"${extraAttrs}`,
});
}
} else {
playlist.items.PlaylistItem[idx].set(
"daterange",
`ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-URI="${uri}"${extraAttrs}`
);
if (isAssetList) {
playlist.items.PlaylistItem[idx].set(
"daterange",
`ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-LIST="${uri}"${extraAttrs}`
);
} else {
playlist.items.PlaylistItem[idx].set(
"daterange",
`ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-URI="${uri}"${extraAttrs}`
);
}
}
}
}
}

insertInterstitialAt(offset, id, uri, isAssetList, opts) {
insertInterstitialAt(offset, id, uri, isAssetList, opts={
resumeOffset: undefined,
playoutLimit: undefined,
snap: undefined,
restrict: undefined,
contentmayvary: undefined,
timelineoccupies: undefined,
timelinestyle: undefined,
custombeacon: undefined,
cue: undefined,
}) {
let HAS_CUE_ATTR = false;

return new Promise((resolve, reject) => {
if (this.bumperDuration) {
offset = this.bumperDuration + offset;
}
let startDate;
let startDate;
let extraAttrs = "";
if (opts) {

if (opts.cue) {
const cueValue = _parseValidCueValues(opts.cue);
if (cueValue) {
extraAttrs += `,CUE="${cueValue}"`;
HAS_CUE_ATTR = true;
}
}

if (opts.resumeOffset !== undefined) {
extraAttrs += `,X-RESUME-OFFSET=${opts.resumeOffset / 1000}`;
}
Expand Down Expand Up @@ -547,28 +614,46 @@ class HLSSpliceVod {
let pos = 0;
let i = 0;
this.playlists[bw].items.PlaylistItem[0].set("date", new Date(1));
while (pos < offset && i < this.playlists[bw].items.PlaylistItem.length) {
const playlistSize = this.playlists[bw].items.PlaylistItem.length;
while (pos < offset && i < playlistSize) {
const plItem = this.playlists[bw].items.PlaylistItem[i];
pos += plItem.get("duration") * 1000;
if (pos <= offset) {
i++;
}
}

if (HAS_CUE_ATTR) {
pos = playlistSize - 1;
}

startDate = new Date(1 + Number(offset)).toISOString();
let durationTag = "";
if (opts && opts.plannedDuration) {
durationTag = `,DURATION=${opts.plannedDuration / 1000}`;
}
if (isAssetList) {
this.playlists[bw].items.PlaylistItem[i].set(
"daterange",
`ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-LIST="${uri}"${extraAttrs}`
);
if (HAS_CUE_ATTR) {
this.playlists[bw].addPlaylistItem({
daterange: `ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-LIST="${uri}"${extraAttrs}`,
});
} else {
this.playlists[bw].items.PlaylistItem[i].set(
"daterange",
`ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-LIST="${uri}"${extraAttrs}`
);
}
} else {
this.playlists[bw].items.PlaylistItem[i].set(
"daterange",
`ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-URI="${uri}"${extraAttrs}`
);
if (HAS_CUE_ATTR) {
this.playlists[bw].addPlaylistItem({
daterange: `ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-URI="${uri}"${extraAttrs}`,
});
} else {
this.playlists[bw].items.PlaylistItem[i].set(
"daterange",
`ID=${id},CLASS="com.apple.hls.interstitial",START-DATE="${startDate}"${durationTag},X-ASSET-URI="${uri}"${extraAttrs}`
);
}
}
}

Expand Down
10 changes: 7 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"nyc": "^15.0.1"
},
"dependencies": {
"@eyevinn/m3u8": "^0.5.6",
"@eyevinn/m3u8": "^0.5.7",
"request": "^2.88.2"
}
}
Loading