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

Parse HLS CHARACTERISTICS attribute #2534

Merged
merged 2 commits into from
Apr 30, 2020
Merged

Parse HLS CHARACTERISTICS attribute #2534

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
0761bd7
Parse HLS CHARACTERISTICS attribute
Apr 28, 2020
1410411
Merge branch 'master' into characteristics-hls
Apr 29, 2020
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
16 changes: 12 additions & 4 deletions lib/hls/hls_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,12 +1046,13 @@ shaka.hls.HlsParser = class {
const autoselectAttr = tag.getAttribute('AUTOSELECT');
const primary = !!defaultAttr || !!autoselectAttr;
const channelsCount = type == 'audio' ? this.getChannelsCount_(tag) : null;
const characteristics = tag.getAttributeValue('CHARACTERISTICS');
// TODO: Should we take into account some of the currently ignored
// attributes: FORCED, INSTREAM-ID, CHARACTERISTICS? Attribute
// descriptions: https://bit.ly/2lpjOhj
const streamInfo = await this.createStreamInfo_(
verbatimMediaPlaylistUri, codecs, type, language, primary, name,
channelsCount, /* closedCaptions= */ null);
channelsCount, /* closedCaptions= */ null, characteristics);
if (this.groupIdToStreamInfosMap_.has(groupId)) {
this.groupIdToStreamInfosMap_.get(groupId).push(streamInfo);
} else {
Expand Down Expand Up @@ -1093,7 +1094,8 @@ shaka.hls.HlsParser = class {
const codecs = this.guessCodecs_(type, allCodecs);
const streamInfo = await this.createStreamInfo_(verbatimMediaPlaylistUri,
codecs, type, /* language= */ 'und', /* primary= */ false,
/* name= */ null, /* channelcount= */ null, closedCaptions);
/* name= */ null, /* channelcount= */ null, closedCaptions,
/* characteristics= */ null);
if (streamInfo == null) {
return null;
}
Expand All @@ -1117,11 +1119,12 @@ shaka.hls.HlsParser = class {
* @param {?string} name
* @param {?number} channelsCount
* @param {Map.<string, string>} closedCaptions
* @param {?string} characteristics
* @return {!Promise.<?shaka.hls.HlsParser.StreamInfo>}
* @private
*/
async createStreamInfo_(verbatimMediaPlaylistUri, codecs, type, language,
primary, name, channelsCount, closedCaptions) {
primary, name, channelsCount, closedCaptions, characteristics) {
// TODO: Refactor, too many parameters
let absoluteMediaPlaylistUri = shaka.hls.Utils.constructAbsoluteUri(
this.masterPlaylistUri_, verbatimMediaPlaylistUri);
Expand Down Expand Up @@ -1244,6 +1247,11 @@ shaka.hls.HlsParser = class {
const kind = (type == shaka.util.ManifestParserUtils.ContentType.TEXT) ?
shaka.util.ManifestParserUtils.TextStreamKind.SUBTITLE : undefined;

const roles = [];
if (characteristics) {
roles.push(characteristics);
}

/** @type {shaka.extern.Stream} */
const stream = {
id: this.globalId_++,
Expand All @@ -1268,7 +1276,7 @@ shaka.hls.HlsParser = class {
width: undefined,
height: undefined,
bandwidth: undefined,
roles: [],
roles: roles,
channelsCount,
audioSamplingRate: null,
closedCaptions,
Expand Down
43 changes: 43 additions & 0 deletions test/hls/hls_parser_unit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,49 @@ describe('HlsParser', () => {
await testHlsParser(master, media, manifest);
});

it('parses characteristics from audio tags', async () => {
const master = [
'#EXTM3U\n',
'#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,mp4a",',
'RESOLUTION=960x540,FRAME-RATE=60,AUDIO="aud1"\n',
'video\n',
'#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="en",',
'URI="audio"\n',
'#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="en",',
'CHARACTERISTICS="public.accessibility.describes-video",URI="audio2"\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 manifest = shaka.test.ManifestGenerator.generate((manifest) => {
manifest.anyTimeline();
manifest.addPartialVariant((variant) => {
variant.language = 'en';
variant.addPartialStream(ContentType.VIDEO);
variant.addPartialStream(ContentType.AUDIO, (stream) => {
stream.language = 'en';
});
});
manifest.addPartialVariant((variant) => {
variant.language = 'en';
variant.addPartialStream(ContentType.VIDEO);
variant.addPartialStream(ContentType.AUDIO, (stream) => {
stream.language = 'en';
stream.roles = ['public.accessibility.describes-video'];
});
});
});

await testHlsParser(master, media, manifest);
});

it('should call filter during parsing', async () => {
const master = [
'#EXTM3U\n',
Expand Down