cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 19:38:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

firefox hls fixes

Browse Source
This commit is contained in:
Luke Pulverenti 2016-01-14 00:18:46 -05:00
parent 3578670ef6
commit e7a0781195
9 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View File

@ -15,12 +15,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.0.17", "version": "1.0.18",
"_release": "1.0.17", "_release": "1.0.18",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.17", "tag": "1.0.18",
"commit": "f70b1e8c554d92f4a7e3f1e8358ba42971d82492" "commit": "a251227c4635bcac732075e494b2d8a4e7956d26"
}, },
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git", "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0", "_target": "~1.0.0",

1
dashboard-ui/bower_components/emby-webcomponents/browser.js vendored
View File

@ -8,6 +8,7 @@
/(opr)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || /(opr)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
/(chrome)[ \/]([\w.]+)/.exec(ua) || /(chrome)[ \/]([\w.]+)/.exec(ua) ||
/(safari)[ \/]([\w.]+)/.exec(ua) || /(safari)[ \/]([\w.]+)/.exec(ua) ||
/(firefox)[ \/]([\w.]+)/.exec(ua) ||
/(msie) ([\w.]+)/.exec(ua) || /(msie) ([\w.]+)/.exec(ua) ||
ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) || ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
[]; [];

12
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View File

@ -29,7 +29,7 @@
list.push('h264'); list.push('h264');
} }
if (document.createElement('audio').canPlayType('audio/aac').replace(/no/, '')) { if (document.createElement('audio').canPlayType('audio/aac').replace(/no/, '') || browser.firefox) {
list.push('aac'); list.push('aac');
} }
@ -104,12 +104,22 @@
profile.DirectPlayProfiles = []; profile.DirectPlayProfiles = [];
var videoAudioCodecs = []; var videoAudioCodecs = [];
// Only put mp3 first if mkv support is there
// Otherwise with HLS and mp3 audio we're seeing some browsers
if (canPlayMkv) {
if (canPlayMp3) { if (canPlayMp3) {
videoAudioCodecs.push('mp3'); videoAudioCodecs.push('mp3');
} }
}
if (canPlayAac) { if (canPlayAac) {
videoAudioCodecs.push('aac'); videoAudioCodecs.push('aac');
} }
if (!canPlayMkv) {
if (canPlayMp3) {
videoAudioCodecs.push('mp3');
}
}
if (canPlayAc3) { if (canPlayAc3) {
videoAudioCodecs.push('ac3'); videoAudioCodecs.push('ac3');
} }

6
dashboard-ui/bower_components/iron-behaviors/.bower.json vendored
View File

@ -29,14 +29,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/iron-behaviors", "homepage": "https://github.com/polymerelements/iron-behaviors",
"_release": "1.0.12", "_release": "1.0.12",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.12", "tag": "v1.0.12",
"commit": "657f526a2382a659cdf4e13be87ecc89261588a3" "commit": "657f526a2382a659cdf4e13be87ecc89261588a3"
}, },
"_source": "git://github.com/PolymerElements/iron-behaviors.git", "_source": "git://github.com/polymerelements/iron-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-behaviors" "_originalSource": "polymerelements/iron-behaviors"
} }

4
dashboard-ui/bower_components/iron-selector/.bower.json vendored
View File

@ -36,7 +36,7 @@
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff" "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff"
}, },
"_source": "git://github.com/polymerelements/iron-selector.git", "_source": "git://github.com/PolymerElements/iron-selector.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-selector" "_originalSource": "PolymerElements/iron-selector"
} }

6
dashboard-ui/bower_components/paper-input/.bower.json vendored
View File

@ -53,7 +53,7 @@
"tag": "v1.1.4", "tag": "v1.1.4",
"commit": "8ca01ac3cafc61abd980d262875ffca0c79640fa" "commit": "8ca01ac3cafc61abd980d262875ffca0c79640fa"
}, },
"_source": "git://github.com/PolymerElements/paper-input.git", "_source": "git://github.com/polymerelements/paper-input.git",
"_target": "^1.0.0", "_target": "^1.0.9",
"_originalSource": "PolymerElements/paper-input" "_originalSource": "polymerelements/paper-input"
} }

6
dashboard-ui/bower_components/polymer/.bower.json vendored
View File

@ -24,14 +24,14 @@
"web-component-tester": "*" "web-component-tester": "*"
}, },
"private": true, "private": true,
"homepage": "https://github.com/Polymer/polymer", "homepage": "https://github.com/polymer/polymer",
"_release": "1.2.3", "_release": "1.2.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.2.3", "tag": "v1.2.3",
"commit": "aa535d1675342007cbf64dc9c66497cf74cbc616" "commit": "aa535d1675342007cbf64dc9c66497cf74cbc616"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "Polymer/polymer" "_originalSource": "polymer/polymer"
} }

5
dashboard-ui/scripts/mediaplayer-video.js
View File

@ -967,9 +967,12 @@
self.createStreamInfo('Video', item, mediaSource, startPosition).then(function (streamInfo) { self.createStreamInfo('Video', item, mediaSource, startPosition).then(function (streamInfo) {
var isHls = streamInfo.url.toLowerCase().indexOf('.m3u8') != -1;
// Huge hack alert. Safari doesn't seem to like if the segments aren't available right away when playback starts // Huge hack alert. Safari doesn't seem to like if the segments aren't available right away when playback starts
// This will start the transcoding process before actually feeding the video url into the player // This will start the transcoding process before actually feeding the video url into the player
if (browserInfo.safari && !mediaSource.RunTimeTicks) { // Edit: Also seeing stalls from hls.js
if ((browserInfo.safari || browserInfo.msie || browserInfo.firefox) && !mediaSource.RunTimeTicks && isHls) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var hlsPlaylistUrl = streamInfo.url.replace('master.m3u8', 'live.m3u8'); var hlsPlaylistUrl = streamInfo.url.replace('master.m3u8', 'live.m3u8');

14
dashboard-ui/scripts/mediaplayer.js
View File

@ -77,15 +77,20 @@
profile.DirectPlayProfiles = []; profile.DirectPlayProfiles = [];
var videoAudioCodecs = []; var videoAudioCodecs = [];
// Putting mp3 first is really just a hack to ensure we transcode to 2 channels // Only put mp3 first if mkv support is there
// Otherwise with HLS and mp3 audio we're seeing firefox and chrome not play it with HLS
if (canPlayMkv) {
if (canPlayMp3) { if (canPlayMp3) {
videoAudioCodecs.push('mp3'); videoAudioCodecs.push('mp3');
} }
}
if (canPlayAac) { if (canPlayAac) {
videoAudioCodecs.push('aac'); videoAudioCodecs.push('aac');
} }
if (canPlayAc3) { if (!canPlayMkv) {
videoAudioCodecs.push('ac3'); if (canPlayMp3) {
videoAudioCodecs.push('mp3');
}
} }
if (supportedFormats.indexOf('h264') != -1) { if (supportedFormats.indexOf('h264') != -1) {
@ -1826,7 +1831,8 @@
list.push('h264'); list.push('h264');
} }
if (document.createElement('audio').canPlayType('audio/aac').replace(/no/, '')) { // Firefox always reports that it doesn't support aac, so assume that it does
if (document.createElement('audio').canPlayType('audio/aac').replace(/no/, '') || browserInfo.firefox) {
list.push('aac'); list.push('aac');
} }
if (document.createElement('audio').canPlayType('audio/mp3').replace(/no/, '')) { if (document.createElement('audio').canPlayType('audio/mp3').replace(/no/, '')) {