aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-03-29 15:16:43 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-03-29 15:16:43 -0400
commitf641c501a78d6270793ee9c9fa185517be6df008 (patch)
tree7c8d81191604d50b0ed71e07bbec0f6835d6250a /Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
parentcb5c9333c5f7bf318976b3790e727127ca481354 (diff)
improve cancellation support of auto-organize
Diffstat (limited to 'Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs')
-rw-r--r--Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
index 9a8a930bde..3906df0005 100644
--- a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
namespace Emby.Server.Implementations.LiveTv
@@ -29,6 +30,8 @@ namespace Emby.Server.Implementations.LiveTv
var now = DateTime.UtcNow;
+ var allowVideoStreamCopy = mediaSource.MediaStreams.Any(i => i.Type == MediaStreamType.Video && i.AllowStreamCopy);
+
var info = await _mediaEncoder.GetMediaInfo(new MediaInfoRequest
{
InputPath = mediaSource.Path,
@@ -73,6 +76,8 @@ namespace Emby.Server.Implementations.LiveTv
var videoStream = mediaSource.MediaStreams.FirstOrDefault(i => i.Type == MediaBrowser.Model.Entities.MediaStreamType.Video);
if (videoStream != null)
{
+ videoStream.AllowStreamCopy = allowVideoStreamCopy;
+
if (!videoStream.BitRate.HasValue)
{
var width = videoStream.Width ?? 1920;