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

update live tv config page

This commit is contained in:
Luke Pulverenti 2016-09-02 08:30:47 -04:00
parent 2737d1f9f9
commit 68bd2a782c
9 changed files with 89 additions and 57 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.208",
"_release": "1.4.208",
"version": "1.4.209",
"_release": "1.4.209",
"_resolution": {
"type": "version",
"tag": "1.4.208",
"commit": "e7d9ca4dc8083c9dc63d5add4d73f0179369461a"
"tag": "1.4.209",
"commit": "e83ed420a7c59b3d413329b046103e001ed784e5"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -5,6 +5,10 @@ define(['browser'], function (browser) {
return !!(v.canPlayType && v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
}
function canPlayH265() {
return false;
}
var _supportsTextTracks;
function supportsTextTracks() {
@ -257,7 +261,7 @@ define(['browser'], function (browser) {
// Only put mp3 first if mkv support is there
// Otherwise with HLS and mp3 audio we're seeing some browsers
if (videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') || isEdgeUniversal()) {
if (videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') || isEdgeUniversal() || browser.tizen) {
// safari is lying
if (!browser.safari) {
videoAudioCodecs.push('ac3');
@ -293,20 +297,29 @@ define(['browser'], function (browser) {
//videoAudioCodecs.push('truehd');
}
var mp4VideoCodecs = [];
if (canPlayH264()) {
mp4VideoCodecs.push('h264');
}
if (canPlayH265()) {
mp4VideoCodecs.push('h265');
mp4VideoCodecs.push('hevc');
}
if (mp4VideoCodecs.length) {
profile.DirectPlayProfiles.push({
Container: 'mp4,m4v',
Type: 'Video',
VideoCodec: 'h264',
VideoCodec: mp4VideoCodecs.join(','),
AudioCodec: videoAudioCodecs.join(',')
});
}
if (canPlayMkv) {
if (canPlayMkv && mp4VideoCodecs.length) {
profile.DirectPlayProfiles.push({
Container: 'mkv',
Type: 'Video',
VideoCodec: 'h264',
VideoCodec: mp4VideoCodecs.join(','),
AudioCodec: videoAudioCodecs.join(',')
});

View file

@ -4,10 +4,10 @@
}
.formDialogHeader {
padding: .7em .5em;
padding: .8em .5em;
display: flex;
align-items: center;
background-color: #101010;
background-color: #222326;
flex-shrink: 0;
}

View file

@ -110,11 +110,7 @@ define(['browser', 'layoutManager', 'dom', 'scrollStyles'], function (browser, l
// native scroll is a must with touch input
// also use native scroll when scrolling vertically in desktop mode - excluding horizontal because the mouse wheel support is choppy at the moment
// in cases with firefox, if the smooth scroll api is supported then use that because their implementation is very good
if (browser.operaTv) {
// no scrolling supported
options.enableNativeScroll = false;
}
else if (isSmoothScrollSupported && browser.firefox) {
if (isSmoothScrollSupported && browser.firefox) {
// native smooth scroll
options.enableNativeScroll = true;
}