Skip to content

Commit

Permalink
Demo: disable unsupported manifest types
Browse files Browse the repository at this point in the history
Now that our demo might be running on iOS, where only HLS will be
supported, we need to filter out unsupported manifest types in the
demo app based on the results of probeSupport().

Note that disabled options in a select element are still selectable
on some iOS versions on iphone.  This is certainly a browser bug
outside of my control, and may be obsoleted by design choices in the
upcoming replacement of our demo app.

Closes #997

Change-Id: I466e67729111bf7f3d70324e593d53e3456147a3
  • Loading branch information
joeyparrish committed Apr 16, 2019
1 parent 65a16ed commit ad66a01
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
9 changes: 9 additions & 0 deletions demo/asset_section.js
Expand Up @@ -80,6 +80,15 @@ shakaDemo.setupAssets_ = function() {
option.disabled = true;
}

if (asset.features.includes(shakaAssets.Feature.DASH) &&
!shakaDemo.support_.manifest['mpd']) {
option.disabled = true;
}
if (asset.features.includes(shakaAssets.Feature.HLS) &&
!shakaDemo.support_.manifest['m3u8']) {
option.disabled = true;
}

if (!option.disabled && !group.disabled) {
first = first || option;
if (asset.focus) first = option;
Expand Down
3 changes: 3 additions & 0 deletions demo/common/assets.js
Expand Up @@ -870,6 +870,7 @@ shakaAssets.testAssets = [
source: shakaAssets.Source.AXINOM,
drm: [],
features: [
shakaAssets.Feature.DASH,
shakaAssets.Feature.EMBEDDED_TEXT,
shakaAssets.Feature.LIVE,
shakaAssets.Feature.MP4,
Expand Down Expand Up @@ -1008,6 +1009,7 @@ shakaAssets.testAssets = [
source: shakaAssets.Source.DASH_IF,
drm: [],
features: [
shakaAssets.Feature.DASH,
shakaAssets.Feature.MP4,
shakaAssets.Feature.SEGMENT_TEMPLATE_TIMELINE,
shakaAssets.Feature.OFFLINE,
Expand All @@ -1023,6 +1025,7 @@ shakaAssets.testAssets = [
source: shakaAssets.Source.DASH_IF,
drm: [],
features: [
shakaAssets.Feature.DASH,
shakaAssets.Feature.LIVE,
shakaAssets.Feature.MP4,
shakaAssets.Feature.SEGMENT_TEMPLATE_DURATION,
Expand Down

0 comments on commit ad66a01

Please sign in to comment.