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

ignore query when checking for mp4 url extension #3758

Merged
merged 3 commits into from Apr 12, 2021
Merged

ignore query when checking for mp4 url extension #3758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cb94a6
ignore query when checking for mp4 url extension
tjenkinson Apr 10, 2021
a6b93c8
add test
tjenkinson Apr 10, 2021
65cbaf8
Merge branch 'master' into url-toolkit-mp4
tjenkinson Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/loader/m3u8-parser.ts
View file
Open in desktop
Expand Up @@ -61,6 +61,10 @@ const LEVEL_PLAYLIST_REGEX_SLOW = new RegExp(

const MP4_REGEX_SUFFIX = /\.(mp4|m4s|m4v|m4a)$/i;

function isMP4Url(url: string): boolean {
return MP4_REGEX_SUFFIX.test(URLToolkit.parseURL(url)?.path ?? '');
}

export default class M3U8Parser {
static findGroup(
groups: Array<AudioGroup>,
Expand Down Expand Up @@ -511,8 +515,8 @@ export default class M3U8Parser {
// if the fragments are TS or MP4, except if we download them :/
// but this is to be able to handle SIDX.
if (
level.fragments.every((frag) =>
MP4_REGEX_SUFFIX.test(frag.relurl as string)
level.fragments.every(
(frag) => frag.relurl && isMP4Url(frag.relurl)
)
) {
logger.warn(
Expand Down
17 changes: 17 additions & 0 deletions tests/unit/loader/playlist-loader.js
View file
Open in desktop
Expand Up @@ -344,6 +344,23 @@ http://proxy-62.dailymotion.com/sec(3ae40f708f79ca9471f52b86da76a3a8)/video/107/
);
});

it('handles a missing init segment for mp4 segment urls', function () {
const level = `#EXTM3U
#EXT-X-VERSION:3
#EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-TARGETDURATION:14
#EXTINF:11.360,
/something.mp4?abc
#EXT-X-ENDLIST`;
const result = M3U8Parser.parseLevelPlaylist(
level,
'http://example.invalid/playlist.m3u8',
0
);
expect(result.initSegment).to.be.ok;
expect(result.initSegment.relurl).to.equal('/something.mp4?abc');
});

it('parse level with single char fragment URI', function () {
const level = `#EXTM3U
#EXT-X-ALLOW-CACHE:NO
Expand Down