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

update components

Browse source
This commit is contained in:
Luke Pulverenti 2016-11-12 20:53:51 -05:00
parent 19eef131c9
commit e95dc53708
2 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.333", "version": "1.4.334",
"_release": "1.4.333", "_release": "1.4.334",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.333", "tag": "1.4.334",
"commit": "abb2fe3a9bac2638a815d6b44a8ebfb967d77722" "commit": "6f1606bb05f1cabf7cc36cfd77185496e8472b0e"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

35
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -159,7 +159,7 @@ define(['browser'], function (browser) {
break; break;
case 'mpg': case 'mpg':
case 'mpeg': case 'mpeg':
supported = browser.edgeUwp; supported = browser.edgeUwp || browser.tizen;
break; break;
case '3gp': case '3gp':
case 'flv': case 'flv':
@ -492,6 +492,8 @@ define(['browser'], function (browser) {
profile.CodecProfiles = []; profile.CodecProfiles = [];
var supportsSecondaryAudio = browser.tizen;
// Handle he-aac not supported // Handle he-aac not supported
if (!videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.5"').replace(/no/, '')) { if (!videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.5"').replace(/no/, '')) {
profile.CodecProfiles.push({ profile.CodecProfiles.push({
@ -507,7 +509,24 @@ define(['browser'], function (browser) {
Condition: 'LessThanEqual', Condition: 'LessThanEqual',
Property: 'AudioBitrate', Property: 'AudioBitrate',
Value: '128000' Value: '128000'
}, }
]
});
if (!supportsSecondaryAudio) {
profile.CodecProfiles[profile.CodecProfiles.length - 1].Conditions.push({
Condition: 'Equals',
Property: 'IsSecondaryAudio',
Value: 'false',
IsRequired: 'false'
});
}
}
if (!supportsSecondaryAudio) {
profile.CodecProfiles.push({
Type: 'VideoAudio',
Conditions: [
{ {
Condition: 'Equals', Condition: 'Equals',
Property: 'IsSecondaryAudio', Property: 'IsSecondaryAudio',
@ -518,18 +537,6 @@ define(['browser'], function (browser) {
}); });
} }
profile.CodecProfiles.push({
Type: 'VideoAudio',
Conditions: [
{
Condition: 'Equals',
Property: 'IsSecondaryAudio',
Value: 'false',
IsRequired: 'false'
}
]
});
var maxLevel = '41'; var maxLevel = '41';
if (browser.chrome && !browser.mobile) { if (browser.chrome && !browser.mobile) {