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

Fix/llhls query #1199

Merged
merged 6 commits into from
Sep 15, 2021
Merged

Fix/llhls query #1199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1dbb003
fix: use URL to add searchParams for LLHLS
brandonocasey Sep 13, 2021
c53ce9d
no llhls on ie 11
brandonocasey Sep 13, 2021
d640697
ie 11 test fixes
brandonocasey Sep 14, 2021
b3e6c5c
more ie 11 fixes
brandonocasey Sep 14, 2021
f778f38
revert ie 11 fix, put in pr #1200
brandonocasey Sep 15, 2021
09bf6c6
Merge branch 'main' into fix/llhls-query
brandonocasey Sep 15, 2021
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
37 changes: 27 additions & 10 deletions src/playlist-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ import {getKnownPartCount} from './playlist.js';
const { mergeOptions, EventTarget } = videojs;

const addLLHLSQueryDirectives = (uri, media) => {
if (media.endList) {
if (media.endList || !media.serverControl) {
return uri;
}
const query = [];

if (media.serverControl && media.serverControl.canBlockReload) {
const parameters = {};

if (media.serverControl.canBlockReload) {
const {preloadSegment} = media;
// next msn is a zero based value, length is not.
let nextMSN = media.mediaSequence + media.segments.length;
Expand All @@ -44,7 +45,8 @@ const addLLHLSQueryDirectives = (uri, media) => {
// and we need to add the _HLS_part= query
if (nextPart > -1 && nextPart !== (parts.length - 1)) {
// add existing parts to our preload hints
query.push(`_HLS_part=${nextPart}`);
// eslint-disable-next-line
parameters._HLS_part = nextPart;
}

// this if statement makes sure that we request the msn
Expand All @@ -62,19 +64,29 @@ const addLLHLSQueryDirectives = (uri, media) => {
}

// add _HLS_msn= in front of any _HLS_part query
query.unshift(`_HLS_msn=${nextMSN}`);
// eslint-disable-next-line
parameters._HLS_msn = nextMSN;
}

if (media.serverControl && media.serverControl.canSkipUntil) {
// add _HLS_skip= infront of all other queries.
query.unshift('_HLS_skip=' + (media.serverControl.canSkipDateranges ? 'v2' : 'YES'));
// eslint-disable-next-line
parameters._HLS_skip = (media.serverControl.canSkipDateranges ? 'v2' : 'YES');
}

query.forEach(function(str, i) {
const symbol = i === 0 ? '?' : '&';
if (Object.keys(parameters).length) {
const parsedUri = new window.URL(uri);

uri += `${symbol}${str}`;
});
['_HLS_skip', '_HLS_msn', '_HLS_part'].forEach(function(name) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to make sure that we keep the parameters in an expected order of skip, msn, and part as it makes reading the urls much easier.

if (!parameters.hasOwnProperty(name)) {
return;
}

parsedUri.searchParams.set(name, parameters[name]);
});

uri = parsedUri.toString();
}

return uri;
};
Expand Down Expand Up @@ -385,6 +397,11 @@ export default class PlaylistLoader extends EventTarget {
this.customTagMappers = (vhsOptions && vhsOptions.customTagMappers) || [];
this.experimentalLLHLS = (vhsOptions && vhsOptions.experimentalLLHLS) || false;

// force experimentalLLHLS for IE 11
if (videojs.browser.IE_VERSION) {
this.experimentalLLHLS = false;
}

// initialize the loader state
this.state = 'HAVE_NOTHING';

Expand Down
Loading