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

add manifest.dash.ignoreEmptyAdaptationSet config option #2330

Merged
merged 1 commit into from
Jan 8, 2020
Merged

add manifest.dash.ignoreEmptyAdaptationSet config option #2330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions demo/common/message_ids.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ shakaDemo.MessageIds = {
AUTO_CORRECT_DASH_DRIFT: 'DEMO_AUTO_CORRECT_DASH_DRIFT',
XLINK_FAIL_GRACEFULLY: 'DEMO_XLINK_FAIL_GRACEFULLY',
IGNORE_DASH_SUGGESTED_PRESENTATION_DELAY: 'DEMO_IGNORE_DASH_SUGGESTED_PRESENTATION_DELAY',
IGNORE_DASH_EMPTY_ADAPTATION_SET: 'DEMO_IGNORE_DASH_EMPTY_ADAPTATION_SET',
IGNORE_HLS_TEXT_FAILURES: 'DEMO_IGNORE_HLS_TEXT_FAILURES',
AVAILABILITY_WINDOW_OVERRIDE: 'DEMO_AVAILABILITY_WINDOW_OVERRIDE',
CLOCK_SYNC_URI: 'DEMO_CLOCK_SYNC_URI',
Expand Down
2 changes: 2 additions & 0 deletions demo/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ shakaDemo.Config = class {
'manifest.dash.xlinkFailGracefully')
.addBoolInput_(MessageIds.IGNORE_DASH_SUGGESTED_PRESENTATION_DELAY,
'manifest.dash.ignoreSuggestedPresentationDelay')
.addBoolInput_(MessageIds.IGNORE_DASH_EMPTY_ADAPTATION_SET,
'manifest.dash.ignoreEmptyAdaptationSet')
.addBoolInput_(MessageIds.IGNORE_HLS_TEXT_FAILURES,
'manifest.hls.ignoreTextStreamFailures')
.addNumberInput_(MessageIds.AVAILABILITY_WINDOW_OVERRIDE,
Expand Down
7 changes: 6 additions & 1 deletion externs/shaka/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,8 @@ shaka.extern.DrmConfiguration;
* ignoreMinBufferTime: boolean,
* autoCorrectDrift: boolean,
* initialSegmentLimit: number,
* ignoreSuggestedPresentationDelay: boolean
* ignoreSuggestedPresentationDelay: boolean,
* ignoreEmptyAdaptationSet: boolean
* }}
*
* @property {shaka.extern.DashContentProtectionCallback} customScheme
Expand Down Expand Up @@ -583,6 +584,10 @@ shaka.extern.DrmConfiguration;
* If true will cause DASH parser to ignore
* <code>suggestedPresentationDelay</code> from manifest. Defaults to
* <code>false</code> if not provided.
* @property {boolean} ignoreEmptyAdaptationSet
* If true will cause DASH parser to ignore
* empty <code>AdaptationSet</code> from manifest. Defaults to
* <code>false</code> if not provided.
* @exportDoc
*/
shaka.extern.DashManifestConfiguration;
Expand Down
5 changes: 3 additions & 2 deletions lib/dash/dash_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,8 +915,9 @@ shaka.dash.DashParser = class {
}).filter((s) => !!s);

if (streams.length == 0) {
// Ignore empty AdaptationSets if they are for text content.
if (isText) {
// Ignore empty AdaptationSets if ignoreEmptyAdaptationSet is true
// or they are for text content.
if (this.config_.dash.ignoreEmptyAdaptationSet || isText) {
return null;
}
throw new shaka.util.Error(
Expand Down
1 change: 1 addition & 0 deletions lib/util/player_configuration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ shaka.util.PlayerConfiguration = class {
autoCorrectDrift: true,
initialSegmentLimit: 1000,
ignoreSuggestedPresentationDelay: false,
ignoreEmptyAdaptationSet: false,
},
hls: {
ignoreTextStreamFailures: false,
Expand Down
26 changes: 26 additions & 0 deletions test/dash/dash_parser_manifest_unit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,32 @@ describe('DashParser Manifest', () => {
expect(presentationDelay).toBe(config.dash.defaultPresentationDelay);
});

it('Honors the ignoreEmptyAdaptationSet config', async () => {
const manifestText = [
'<MPD minBufferTime="PT2S" suggestedPresentationDelay="PT25S">',
' <Period id="1" duration="PT30S">',
' <AdaptationSet id="1" mimeType="video/mp4">',
' <Representation id="video-sd" width="640" height="480">',
' <BaseURL>v-sd.mp4</BaseURL>',
' <SegmentBase indexRange="100-200" />',
' </Representation>',
' </AdaptationSet>',
' <AdaptationSet id="2" mimeType="audio/mp4">',
' </AdaptationSet>',
' </Period>',
'</MPD>',
].join('\n');

fakeNetEngine.setResponseText('dummy://foo', manifestText);
const config = shaka.util.PlayerConfiguration.createDefault().manifest;
config.dash.ignoreEmptyAdaptationSet = true;
parser.configure(config);

/** @type {shaka.extern.Manifest} */
const manifest = await parser.start('dummy://foo', playerInterface);
expect(manifest.presentationTimeline).toBeTruthy();
});

it('converts Accessibility element to "kind"', async () => {
const manifestText = [
'<MPD minBufferTime="PT75S">',
Expand Down