Merge branch 'dev' of https://github.com/hatharry/Emby.git

1 files changed, 70 insertions, 34 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 4a533ff93..e7bfe56f2 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -221,8 +221,28 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
-        public async Task<MediaSourceInfo> GetMediaSource(IHasMediaSources item, string mediaSourceId, bool enablePathSubstitution)
+        public async Task<MediaSourceInfo> GetMediaSource(IHasMediaSources item, string mediaSourceId, string liveStreamId, bool enablePathSubstitution, CancellationToken cancellationToken)
         {
+            if (!string.IsNullOrWhiteSpace(liveStreamId))
+            {
+                return await GetLiveStream(liveStreamId, cancellationToken).ConfigureAwait(false);
+            }
+            //await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            //try
+            //{
+            //    var stream = _openStreams.Values.FirstOrDefault(i => string.Equals(i.MediaSource.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
+
+            //    if (stream != null)
+            //    {
+            //        return stream.MediaSource;
+            //    }
+            //}
+            //finally
+            //{
+            //    _liveStreamSemaphore.Release();
+            //}
+
             var sources = await GetPlayackMediaSources(item.Id.ToString("N"), null, enablePathSubstitution, new[] { MediaType.Audio, MediaType.Video },
                         CancellationToken.None).ConfigureAwait(false);
 
@@ -335,7 +355,7 @@ namespace MediaBrowser.Server.Implementations.Library
             .ToList();
         }
 
-        private readonly ConcurrentDictionary<string, LiveStreamInfo> _openStreams = new ConcurrentDictionary<string, LiveStreamInfo>(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, LiveStreamInfo> _openStreams = new Dictionary<string, LiveStreamInfo>(StringComparer.OrdinalIgnoreCase);
         private readonly SemaphoreSlim _liveStreamSemaphore = new SemaphoreSlim(1, 1);
 
         public async Task<LiveStreamResponse> OpenLiveStream(LiveStreamRequest request, bool enableAutoClose, CancellationToken cancellationToken)
@@ -347,7 +367,9 @@ namespace MediaBrowser.Server.Implementations.Library
                 var tuple = GetProvider(request.OpenToken);
                 var provider = tuple.Item1;
 
-                var mediaSource = await provider.OpenMediaSource(tuple.Item2, cancellationToken).ConfigureAwait(false);
+                var mediaSourceTuple = await provider.OpenMediaSource(tuple.Item2, cancellationToken).ConfigureAwait(false);
+
+                var mediaSource = mediaSourceTuple.Item1;
 
                 if (string.IsNullOrWhiteSpace(mediaSource.LiveStreamId))
                 {
@@ -361,9 +383,11 @@ namespace MediaBrowser.Server.Implementations.Library
                     Date = DateTime.UtcNow,
                     EnableCloseTimer = enableAutoClose,
                     Id = mediaSource.LiveStreamId,
-                    MediaSource = mediaSource
+                    MediaSource = mediaSource,
+                    DirectStreamProvider = mediaSourceTuple.Item2
                 };
-                _openStreams.AddOrUpdate(mediaSource.LiveStreamId, info, (key, i) => info);
+
+                _openStreams[mediaSource.LiveStreamId] = info;
 
                 if (enableAutoClose)
                 {
@@ -394,14 +418,14 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
-        public async Task<MediaSourceInfo> GetLiveStream(string id, CancellationToken cancellationToken)
+        public async Task<Tuple<MediaSourceInfo, IDirectStreamProvider>> GetLiveStreamWithDirectStreamProvider(string id, CancellationToken cancellationToken)
         {
             if (string.IsNullOrWhiteSpace(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            _logger.Debug("Getting live stream {0}", id);
+            _logger.Debug("Getting already opened live stream {0}", id);
 
             await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
 
@@ -410,7 +434,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 LiveStreamInfo info;
                 if (_openStreams.TryGetValue(id, out info))
                 {
-                    return info.MediaSource;
+                    return new Tuple<MediaSourceInfo, IDirectStreamProvider>(info.MediaSource, info.DirectStreamProvider);
                 }
                 else
                 {
@@ -423,6 +447,12 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
+        public async Task<MediaSourceInfo> GetLiveStream(string id, CancellationToken cancellationToken)
+        {
+            var result = await GetLiveStreamWithDirectStreamProvider(id, cancellationToken).ConfigureAwait(false);
+            return result.Item1;
+        }
+
         public async Task PingLiveStream(string id, CancellationToken cancellationToken)
         {
             await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
@@ -436,7 +466,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
                 else
                 {
-                    _logger.Error("Failed to update MediaSource timestamp for {0}", id);
+                    _logger.Error("Failed to ping live stream {0}", id);
                 }
             }
             finally
@@ -445,17 +475,16 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
-        private async Task CloseLiveStreamWithProvider(IMediaSourceProvider provider, string streamId, CancellationToken cancellationToken)
+        private async Task CloseLiveStreamWithProvider(IMediaSourceProvider provider, string streamId)
         {
             _logger.Info("Closing live stream {0} with provider {1}", streamId, provider.GetType().Name);
 
             try
             {
-                await provider.CloseMediaSource(streamId, cancellationToken).ConfigureAwait(false);
+                await provider.CloseMediaSource(streamId).ConfigureAwait(false);
             }
             catch (NotImplementedException)
             {
-
             }
             catch (Exception ex)
             {
@@ -463,37 +492,35 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
-        public async Task CloseLiveStream(string id, CancellationToken cancellationToken)
+        public async Task CloseLiveStream(string id)
         {
             if (string.IsNullOrWhiteSpace(id))
             {
                 throw new ArgumentNullException("id");
             }
 
-            await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+            await _liveStreamSemaphore.WaitAsync().ConfigureAwait(false);
 
             try
             {
                 LiveStreamInfo current;
+
                 if (_openStreams.TryGetValue(id, out current))
                 {
+                    _openStreams.Remove(id);
+                    current.Closed = true;
+
                     if (current.MediaSource.RequiresClosing)
                     {
                         var tuple = GetProvider(id);
 
-                        await CloseLiveStreamWithProvider(tuple.Item1, tuple.Item2, cancellationToken).ConfigureAwait(false);
+                        await CloseLiveStreamWithProvider(tuple.Item1, tuple.Item2).ConfigureAwait(false);
                     }
-                }
 
-                LiveStreamInfo removed;
-                if (_openStreams.TryRemove(id, out removed))
-                {
-                    removed.Closed = true;
-                }
-
-                if (_openStreams.Count == 0)
-                {
-                    StopCloseTimer();
+                    if (_openStreams.Count == 0)
+                    {
+                        StopCloseTimer();
+                    }
                 }
             }
             finally
@@ -523,7 +550,7 @@ namespace MediaBrowser.Server.Implementations.Library
         }
 
         private Timer _closeTimer;
-        private readonly TimeSpan _openStreamMaxAge = TimeSpan.FromSeconds(60);
+        private readonly TimeSpan _openStreamMaxAge = TimeSpan.FromSeconds(180);
 
         private void StartCloseTimer()
         {
@@ -545,10 +572,20 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private async void CloseTimerCallback(object state)
         {
-            var infos = _openStreams
-                .Values
-                .Where(i => i.EnableCloseTimer && DateTime.UtcNow - i.Date > _openStreamMaxAge)
-                .ToList();
+            List<LiveStreamInfo> infos;
+            await _liveStreamSemaphore.WaitAsync().ConfigureAwait(false);
+
+            try
+            {
+               infos = _openStreams
+                    .Values
+                    .Where(i => i.EnableCloseTimer && DateTime.UtcNow - i.Date > _openStreamMaxAge)
+                    .ToList();
+            }
+            finally
+            {
+                _liveStreamSemaphore.Release();
+            }
 
             foreach (var info in infos)
             {
@@ -556,7 +593,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 {
                     try
                     {
-                        await CloseLiveStream(info.Id, CancellationToken.None).ConfigureAwait(false);
+                        await CloseLiveStream(info.Id).ConfigureAwait(false);
                     }
                     catch (Exception ex)
                     {
@@ -588,12 +625,10 @@ namespace MediaBrowser.Server.Implementations.Library
                 {
                     foreach (var key in _openStreams.Keys.ToList())
                     {
-                        var task = CloseLiveStream(key, CancellationToken.None);
+                        var task = CloseLiveStream(key);
 
                         Task.WaitAll(task);
                     }
-
-                    _openStreams.Clear();
                 }
             }
         }
@@ -605,6 +640,7 @@ namespace MediaBrowser.Server.Implementations.Library
             public string Id;
             public bool Closed;
             public MediaSourceInfo MediaSource;
+            public IDirectStreamProvider DirectStreamProvider;
         }
     }
 }
\ No newline at end of file