Skip to content

Commit

Permalink
uses new sync supported function
Browse files Browse the repository at this point in the history
  • Loading branch information
leandromoreira committed Aug 13, 2016
1 parent e5e706b commit 5cb7c73
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
10 changes: 2 additions & 8 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export default class DashShakaPlayback extends HTML5Video {

// skipping error handling on video tag in favor of error on shaka
error(event) {
Log.error('an error was raised support=', DashShakaPlayback.support)
Log.error('an error was raised by the video tag', event, this.el.error)
}

Expand Down Expand Up @@ -177,13 +176,8 @@ export default class DashShakaPlayback extends HTML5Video {

DashShakaPlayback.canPlay = (resource, mimeType = '') => {
shaka.polyfill.installAll()

shaka.Player.support().then((support) => { DashShakaPlayback.support = support})

var basic = !!window.Promise && !!window.Uint8Array && !!Array.prototype.forEach
var mediaSource = (window.MediaSource && window.MediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"'))
var basicAndMediaSource = basic && mediaSource
var browserSupported = shaka.Player.isBrowserSupported()

var resourceParts = resource.split('?')[0].match(/.*\.(.*)$/) || []
return basicAndMediaSource && (('mpd' === resourceParts[1]) || mimeType.indexOf('application/dash+xml') > -1)
return browserSupported && (('mpd' === resourceParts[1]) || mimeType.indexOf('application/dash+xml') > -1)
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"author": "Clappr team",
"license": "BSD-3-Clause",
"dependencies": {
"shaka-player": "v2.0.0-beta2",
"clappr": "0.2.54"
"shaka-player": "v2.0.0-beta3",
"clappr": "0.2.61"
},
"devDependencies": {
"webpack": "^1.12.1",
Expand Down

0 comments on commit 5cb7c73

Please sign in to comment.