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(HLS): skip whitespace in attributes #3884

Merged
merged 2 commits into from Feb 11, 2022
Merged

fix(HLS): skip whitespace in attributes #3884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1292567
Skip whitespace in HLS attributes.
wjywbs Jan 20, 2022
e446f72
Add missing sequenceMode in expected HLS manifest
joeyparrish Feb 11, 2022
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
1 change: 1 addition & 0 deletions lib/hls/manifest_text_parser.js
View file
Open in desktop
Expand Up @@ -277,6 +277,7 @@ shaka.hls.ManifestTextParser = class {
const attrValue = blockAttrs[2] || blockAttrs[3];
const attribute = new shaka.hls.Attribute(attrName, attrValue);
attributes.push(attribute);
parser.skipWhitespace();
}
}

Expand Down
75 changes: 75 additions & 0 deletions test/hls/hls_parser_unit.js
View file
Open in desktop
Expand Up @@ -211,6 +211,81 @@ describe('HlsParser', () => {
expect(actual).toEqual(manifest);
});

it('parses manifest attributes with space', async () => {
const master = [
'#EXTM3U\n',
'#EXT-X-MEDIA:TYPE=AUDIO, GROUP-ID="aud1", LANGUAGE="eng", ',
'CHANNELS="16/JOC", URI="audio"\n',
'#EXT-X-MEDIA:TYPE=SUBTITLES, GROUP-ID="sub1", LANGUAGE="eng", ',
'URI="text"\n',
'#EXT-X-MEDIA:TYPE=SUBTITLES, GROUP-ID="sub2", LANGUAGE="es", ',
'URI="text2"\n',
'#EXT-X-STREAM-INF:BANDWIDTH=200, CODECS="avc1,mp4a", ',
'RESOLUTION=960x540, FRAME-RATE=60, AUDIO="aud1"\n',
'video\n',
].join('');

const media = [
'#EXTM3U\n',
'#EXT-X-PLAYLIST-TYPE:VOD\n',
'#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
'#EXTINF:5,\n',
'#EXT-X-BYTERANGE:121090@616\n',
'main.mp4',
].join('');

const textMedia = [
'#EXTM3U\n',
'#EXT-X-PLAYLIST-TYPE:VOD\n',
'#EXTINF:5,\n',
'#EXT-X-BYTERANGE:121090@616\n',
'main.vtt',
].join('');

const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
manifest.sequenceMode = true;
manifest.anyTimeline();
manifest.addPartialVariant((variant) => {
variant.language = 'en';
variant.bandwidth = 200;
variant.addPartialStream(ContentType.VIDEO, (stream) => {
stream.frameRate = 60;
stream.mime('video/mp4', 'avc1');
stream.size(960, 540);
});
variant.addPartialStream(ContentType.AUDIO, (stream) => {
stream.language = 'en';
stream.channelsCount = 16;
stream.spatialAudio = true;
stream.mime('audio/mp4', 'mp4a');
});
});
manifest.addPartialTextStream((stream) => {
stream.language = 'en';
stream.kind = TextStreamKind.SUBTITLE;
stream.mime('text/vtt', '');
});
manifest.addPartialTextStream((stream) => {
stream.language = 'es';
stream.kind = TextStreamKind.SUBTITLE;
stream.mime('text/vtt', '');
});
});

fakeNetEngine
.setResponseText('test:/master', master)
.setResponseText('test:/audio', media)
.setResponseText('test:/video', media)
.setResponseText('test:/text', textMedia)
.setResponseText('test:/text2', textMedia)
.setResponseText('test:/main.vtt', vttText)
.setResponseValue('test:/init.mp4', initSegmentData)
.setResponseValue('test:/main.mp4', segmentData);

const actual = await parser.start('test:/master', playerInterface);
expect(actual).toEqual(manifest);
});

it('prioritize AVERAGE-BANDWIDTH to BANDWIDTH', async () => {
const master = [
'#EXTM3U\n',
Expand Down