1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

firefox hls fixes

This commit is contained in:
Luke Pulverenti 2016-01-14 00:18:46 -05:00
parent 6fcfabe112
commit bb670dc037
9 changed files with 45 additions and 25 deletions

View file

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

View file

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

View file

@ -29,7 +29,7 @@
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');
}
@ -104,12 +104,22 @@
profile.DirectPlayProfiles = [];
var videoAudioCodecs = [];
if (canPlayMp3) {
videoAudioCodecs.push('mp3');
// Only put mp3 first if mkv support is there
// Otherwise with HLS and mp3 audio we're seeing some browsers
if (canPlayMkv) {
if (canPlayMp3) {
videoAudioCodecs.push('mp3');
}
}
if (canPlayAac) {
videoAudioCodecs.push('aac');
}
if (!canPlayMkv) {
if (canPlayMp3) {
videoAudioCodecs.push('mp3');
}
}
if (canPlayAc3) {
videoAudioCodecs.push('ac3');
}