update stream generation

2 files changed, 63 insertions, 15 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 202a051e3b..86b31e0e5d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -313,6 +313,22 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return await GetLiveStream(id, true, cancellationToken).ConfigureAwait(false);
         }
 
+        public async Task<IEnumerable<MediaSourceInfo>> GetRecordingMediaSources(string id, CancellationToken cancellationToken)
+        {
+            var item = await GetInternalRecording(id, cancellationToken).ConfigureAwait(false);
+            var service = GetService(item);
+
+            return await service.GetRecordingStreamMediaSources(id, cancellationToken).ConfigureAwait(false);
+        }
+
+        public async Task<IEnumerable<MediaSourceInfo>> GetChannelMediaSources(string id, CancellationToken cancellationToken)
+        {
+            var item = GetInternalChannel(id);
+            var service = GetService(item);
+
+            return await service.GetChannelStreamMediaSources(id, cancellationToken).ConfigureAwait(false);
+        }
+
         private ILiveTvService GetService(ILiveTvItem item)
         {
             return GetService(item.ServiceName);
@@ -330,7 +346,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             try
             {
                 MediaSourceInfo info;
-                var isVideo = true;
+                bool isVideo;
 
                 if (isChannel)
                 {
@@ -340,7 +356,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     _logger.Info("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
                     info = await service.GetChannelStream(channel.ExternalId, null, cancellationToken).ConfigureAwait(false);
                     info.RequiresClosing = true;
-                    info.CloseKey = info.Id;
+                    info.LiveStreamId = info.Id;
                 }
                 else
                 {
@@ -351,7 +367,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                     _logger.Info("Opening recording stream from {0}, external recording Id: {1}", service.Name, recording.RecordingInfo.Id);
                     info = await service.GetRecordingStream(recording.RecordingInfo.Id, null, cancellationToken).ConfigureAwait(false);
                     info.RequiresClosing = true;
-                    info.CloseKey = info.Id;
+                    info.LiveStreamId = info.Id;
                 }
 
                 _logger.Info("Live stream info: {0}", _jsonSerializer.SerializeToString(info));
@@ -393,7 +409,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                         {
                             Type = MediaStreamType.Video,
                             // Set the index to -1 because we don't know the exact index of the video stream within the container
-                            Index = -1
+                            Index = -1,
+
+                            // Set to true if unknown to enable deinterlacing
+                            IsInterlaced = true
                         },
                         new MediaStream
                         {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index 186bc499db..5de4cf4998 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -2,6 +2,8 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,10 +15,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
     public class LiveTvMediaSourceProvider : IMediaSourceProvider
     {
         private readonly ILiveTvManager _liveTvManager;
+        private readonly IJsonSerializer _jsonSerializer;
+        private readonly ILogger _logger;
 
-        public LiveTvMediaSourceProvider(ILiveTvManager liveTvManager)
+        public LiveTvMediaSourceProvider(ILiveTvManager liveTvManager, IJsonSerializer jsonSerializer, ILogManager logManager)
         {
             _liveTvManager = liveTvManager;
+            _jsonSerializer = jsonSerializer;
+            _logger = logManager.GetLogger(GetType().Name);
         }
 
         public Task<IEnumerable<MediaSourceInfo>> GetMediaSources(IHasMediaSources item, CancellationToken cancellationToken)
@@ -38,28 +44,51 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private async Task<IEnumerable<MediaSourceInfo>> GetMediaSourcesInternal(ILiveTvItem item, CancellationToken cancellationToken)
         {
-            var hasMediaSources = (IHasMediaSources)item;
+            IEnumerable<MediaSourceInfo> sources;
 
-            var sources = hasMediaSources.GetMediaSources(false)
-                .ToList();
+            try
+            {
+                if (item is ILiveTvRecording)
+                {
+                    sources = await _liveTvManager.GetRecordingMediaSources(item.Id.ToString("N"), cancellationToken)
+                                .ConfigureAwait(false);
+                }
+                else
+                {
+                    sources = await _liveTvManager.GetChannelMediaSources(item.Id.ToString("N"), cancellationToken)
+                                .ConfigureAwait(false);
+                }
+            }
+            catch (NotImplementedException)
+            {
+                var hasMediaSources = (IHasMediaSources)item;
+
+                sources = hasMediaSources.GetMediaSources(false)
+                   .ToList();
+            }
 
-            foreach (var source in sources)
+            var list = sources.ToList();
+
+            foreach (var source in list)
             {
                 source.Type = MediaSourceType.Default;
                 source.RequiresOpening = true;
+                source.BufferMs = source.BufferMs ?? 1500;
 
                 var openKeys = new List<string>();
                 openKeys.Add(item.GetType().Name);
                 openKeys.Add(item.Id.ToString("N"));
-                source.OpenKey = string.Join("|", openKeys.ToArray());
+                source.OpenToken = string.Join("|", openKeys.ToArray());
             }
 
-            return sources;
+            _logger.Debug("MediaSources: {0}", _jsonSerializer.SerializeToString(list));
+
+            return list;
         }
 
-        public async Task<MediaSourceInfo> OpenMediaSource(string openKey, CancellationToken cancellationToken)
+        public async Task<MediaSourceInfo> OpenMediaSource(string openToken, CancellationToken cancellationToken)
         {
-            var keys = openKey.Split(new[] { '|' }, 2);
+            var keys = openToken.Split(new[] { '|' }, 2);
 
             if (string.Equals(keys[0], typeof(LiveTvChannel).Name, StringComparison.OrdinalIgnoreCase))
             {
@@ -69,9 +98,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             return await _liveTvManager.GetRecordingStream(keys[1], cancellationToken).ConfigureAwait(false);
         }
 
-        public Task CloseMediaSource(string closeKey, CancellationToken cancellationToken)
+        public Task CloseMediaSource(string liveStreamId, CancellationToken cancellationToken)
         {
-            return _liveTvManager.CloseLiveStream(closeKey, cancellationToken);
+            return _liveTvManager.CloseLiveStream(liveStreamId, cancellationToken);
         }
     }
 }