milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pass all audio codecs to server

Browse source
This commit is contained in:
Luke Pulverenti 2016-06-26 12:21:10 -04:00
parent 8ff44e06a3
commit 559d8eb5f6
3 changed files with 19 additions and 13 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

@ -15,12 +15,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.57", "version": "1.4.58",
"_release": "1.4.57", "_release": "1.4.58",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.57", "tag": "1.4.58",
"commit": "c0eea0e334d3c59e78193619463cc79913d62ffe" "commit": "2bbc190d69ad89110a7b83eec624fbd44df9b17c"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

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

@ -172,6 +172,7 @@ define(['browser'], function (browser) {
if (browser.tizen) { if (browser.tizen) {
return 10000000;
// 2015 models // 2015 models
if (userAgent.indexOf('tizen 2.3') != -1) { if (userAgent.indexOf('tizen 2.3') != -1) {
return 20000000; return 20000000;
@ -228,7 +229,7 @@ define(['browser'], function (browser) {
var mp3Added = false; var mp3Added = false;
if (canPlayMkv || canPlayTs) { if (canPlayMkv || canPlayTs) {
if (supportsMp3VideoAudio && !browser.tizen) { if (supportsMp3VideoAudio) {
mp3Added = true; mp3Added = true;
videoAudioCodecs.push('mp3'); videoAudioCodecs.push('mp3');
hlsVideoAudioCodecs.push('mp3'); hlsVideoAudioCodecs.push('mp3');
@ -314,26 +315,31 @@ define(['browser'], function (browser) {
}); });
}); });
var copyTimestamps = false;
if (browser.chrome) {
copyTimestamps = true;
}
// Can't use mkv on mobile because we have to use the native player controls and they won't be able to seek it // Can't use mkv on mobile because we have to use the native player controls and they won't be able to seek it
if (canPlayMkv && options.supportsCustomSeeking) { if (canPlayMkv && options.supportsCustomSeeking && !browser.tizen) {
profile.TranscodingProfiles.push({ profile.TranscodingProfiles.push({
Container: 'mkv', Container: 'mkv',
Type: 'Video', Type: 'Video',
AudioCodec: videoAudioCodecs.join(','), AudioCodec: videoAudioCodecs.join(','),
VideoCodec: 'h264', VideoCodec: 'h264',
Context: 'Streaming', Context: 'Streaming',
CopyTimestamps: true CopyTimestamps: copyTimestamps
}); });
} }
if (canPlayTs && options.supportsCustomSeeking) { if (canPlayTs && options.supportsCustomSeeking && !browser.tizen) {
profile.TranscodingProfiles.push({ profile.TranscodingProfiles.push({
Container: 'ts', Container: 'ts',
Type: 'Video', Type: 'Video',
AudioCodec: videoAudioCodecs.join(','), AudioCodec: videoAudioCodecs.join(','),
VideoCodec: 'h264', VideoCodec: 'h264',
Context: 'Streaming', Context: 'Streaming',
CopyTimestamps: true, CopyTimestamps: copyTimestamps,
// If audio transcoding is needed, limit channels to number of physical audio channels // If audio transcoding is needed, limit channels to number of physical audio channels
// Trying to transcode to 5 channels when there are only 2 speakers generally does not sound good // Trying to transcode to 5 channels when there are only 2 speakers generally does not sound good
MaxAudioChannels: physicalAudioChannels.toString() MaxAudioChannels: physicalAudioChannels.toString()

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

@ -31,14 +31,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.5.0", "_release": "1.5.0",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.5.0", "tag": "v1.5.0",
"commit": "ce5b9fb2d8aa03c698410e2e55cffcfa0b788a3a" "commit": "ce5b9fb2d8aa03c698410e2e55cffcfa0b788a3a"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.1.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }