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

Merge pull request #1347 from Brissot/master

Browse source 
Fixing Chrome's Unnecessary AV1 Transcode and Combined WebM Profiles
This commit is contained in:
dkanada 2020-06-10 20:37:26 +09:00 • committed by GitHub
commit 51e358cd86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/scripts/browserDeviceProfile.js
View file

@ -151,6 +151,16 @@ define(['browser'], function (browser) {
return false; return false;
} }
function testCanPlayAv1(videoTestElement) {
if (browser.tizenVersion >= 5.5) {
return true;
} else if (browser.web0sVersion >= 5 && window.outerHeight >= 2160) {
return true;
}
return videoTestElement.canPlayType('video/webm; codecs="av01.0.15M.10"').replace(/no/, '');
}
function testCanPlayTs() { function testCanPlayTs() {
return browser.tizen || browser.web0s || browser.edgeUwp; return browser.tizen || browser.web0s || browser.edgeUwp;
} }
@ -277,7 +287,6 @@ define(['browser'], function (browser) {
var canPlayVp8 = videoTestElement.canPlayType('video/webm; codecs="vp8"').replace(/no/, ''); var canPlayVp8 = videoTestElement.canPlayType('video/webm; codecs="vp8"').replace(/no/, '');
var canPlayVp9 = videoTestElement.canPlayType('video/webm; codecs="vp9"').replace(/no/, ''); var canPlayVp9 = videoTestElement.canPlayType('video/webm; codecs="vp9"').replace(/no/, '');
var canPlayAv1 = videoTestElement.canPlayType('video/webm; codecs="av1"').replace(/no/, '');
var webmAudioCodecs = ['vorbis']; var webmAudioCodecs = ['vorbis'];
var canPlayMkv = testCanPlayMkv(videoTestElement); var canPlayMkv = testCanPlayMkv(videoTestElement);
@ -410,6 +419,7 @@ define(['browser'], function (browser) {
}); });
var mp4VideoCodecs = []; var mp4VideoCodecs = [];
var webmVideoCodecs = [];
var hlsVideoCodecs = []; var hlsVideoCodecs = [];
if (canPlayH264(videoTestElement)) { if (canPlayH264(videoTestElement)) {
@ -441,16 +451,32 @@ define(['browser'], function (browser) {
if (canPlayVp8) { if (canPlayVp8) {
mp4VideoCodecs.push('vp8'); mp4VideoCodecs.push('vp8');
webmVideoCodecs.push('vp8');
} }
if (canPlayVp9) { if (canPlayVp9) {
mp4VideoCodecs.push('vp9'); mp4VideoCodecs.push('vp9');
webmVideoCodecs.push('vp9');
}
if (testCanPlayAv1(videoTestElement)) {
mp4VideoCodecs.push('av1');
webmVideoCodecs.push('av1');
} }
if (canPlayVp8 || browser.tizen) { if (canPlayVp8 || browser.tizen) {
videoAudioCodecs.push('vorbis'); videoAudioCodecs.push('vorbis');
} }
if (webmVideoCodecs.length) {
profile.DirectPlayProfiles.push({
Container: 'webm',
Type: 'Video',
VideoCodec: webmVideoCodecs.join(','),
AudioCodec: webmAudioCodecs.join(',')
});
}
if (mp4VideoCodecs.length) { if (mp4VideoCodecs.length) {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: 'mp4,m4v', Container: 'mp4,m4v',
@ -509,33 +535,6 @@ define(['browser'], function (browser) {
} }
}); });
if (canPlayVp8) {
profile.DirectPlayProfiles.push({
Container: 'webm',
Type: 'Video',
AudioCodec: webmAudioCodecs.join(','),
VideoCodec: 'VP8'
});
}
if (canPlayVp9) {
profile.DirectPlayProfiles.push({
Container: 'webm',
Type: 'Video',
AudioCodec: webmAudioCodecs.join(','),
VideoCodec: 'VP9'
});
}
if (canPlayAv1) {
profile.DirectPlayProfiles.push({
Container: 'webm',
Type: 'Video',
AudioCodec: webmAudioCodecs.join(','),
VideoCodec: 'AV1'
});
}
profile.TranscodingProfiles = []; profile.TranscodingProfiles = [];
var hlsBreakOnNonKeyFrames = browser.iOS || browser.osx || browser.edge || !canPlayNativeHls() ? true : false; var hlsBreakOnNonKeyFrames = browser.iOS || browser.osx || browser.edge || !canPlayNativeHls() ? true : false;