From 559d8eb5f6d3ebf774e1ea35f90753ce5e2b69bc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 26 Jun 2016 12:21:10 -0400 Subject: [PATCH] pass all audio codecs to server --- .../emby-webcomponents/.bower.json | 8 ++++---- .../emby-webcomponents/browserdeviceprofile.js | 16 +++++++++++----- .../bower_components/polymer/.bower.json | 8 ++++---- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 29a393a52..39ec4a647 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -15,12 +15,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.57", - "_release": "1.4.57", + "version": "1.4.58", + "_release": "1.4.58", "_resolution": { "type": "version", - "tag": "1.4.57", - "commit": "c0eea0e334d3c59e78193619463cc79913d62ffe" + "tag": "1.4.58", + "commit": "2bbc190d69ad89110a7b83eec624fbd44df9b17c" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js index 9b4290f33..daaafc5e1 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js @@ -172,6 +172,7 @@ define(['browser'], function (browser) { if (browser.tizen) { + return 10000000; // 2015 models if (userAgent.indexOf('tizen 2.3') != -1) { return 20000000; @@ -228,7 +229,7 @@ define(['browser'], function (browser) { var mp3Added = false; if (canPlayMkv || canPlayTs) { - if (supportsMp3VideoAudio && !browser.tizen) { + if (supportsMp3VideoAudio) { mp3Added = true; videoAudioCodecs.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 - if (canPlayMkv && options.supportsCustomSeeking) { + if (canPlayMkv && options.supportsCustomSeeking && !browser.tizen) { profile.TranscodingProfiles.push({ Container: 'mkv', Type: 'Video', AudioCodec: videoAudioCodecs.join(','), VideoCodec: 'h264', Context: 'Streaming', - CopyTimestamps: true + CopyTimestamps: copyTimestamps }); } - if (canPlayTs && options.supportsCustomSeeking) { + if (canPlayTs && options.supportsCustomSeeking && !browser.tizen) { profile.TranscodingProfiles.push({ Container: 'ts', Type: 'Video', AudioCodec: videoAudioCodecs.join(','), VideoCodec: 'h264', Context: 'Streaming', - CopyTimestamps: true, + CopyTimestamps: copyTimestamps, // 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 MaxAudioChannels: physicalAudioChannels.toString() diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index 2b0764a5c..e3120e688 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -31,14 +31,14 @@ "web-component-tester": "*" }, "private": true, - "homepage": "https://github.com/polymer/polymer", + "homepage": "https://github.com/Polymer/polymer", "_release": "1.5.0", "_resolution": { "type": "version", "tag": "v1.5.0", "commit": "ce5b9fb2d8aa03c698410e2e55cffcfa0b788a3a" }, - "_source": "git://github.com/polymer/polymer.git", - "_target": "^1.0.0", - "_originalSource": "polymer/polymer" + "_source": "git://github.com/Polymer/polymer.git", + "_target": "^1.1.0", + "_originalSource": "Polymer/polymer" } \ No newline at end of file