浏览代码

Detach TranscodingJob from StreamState

nyanmisaka 3 年之前
父节点
当前提交
506ed6940b
共有 2 个文件被更改,包括 2 次插入10 次删除
  1. 2 2
      Jellyfin.Api/Helpers/TranscodingJobHelper.cs
  2. 0 8
      Jellyfin.Api/Models/StreamingDtos/StreamState.cs

+ 2 - 2
Jellyfin.Api/Helpers/TranscodingJobHelper.cs

@@ -654,8 +654,8 @@ namespace Jellyfin.Api.Helpers
         {
         {
             if (EnableThrottling(state))
             if (EnableThrottling(state))
             {
             {
-                transcodingJob.TranscodingThrottler = state.TranscodingThrottler = new TranscodingThrottler(transcodingJob, new Logger<TranscodingThrottler>(new LoggerFactory()), _serverConfigurationManager, _fileSystem);
-                state.TranscodingThrottler.Start();
+                transcodingJob.TranscodingThrottler = new TranscodingThrottler(transcodingJob, new Logger<TranscodingThrottler>(new LoggerFactory()), _serverConfigurationManager, _fileSystem);
+                transcodingJob.TranscodingThrottler.Start();
             }
             }
         }
         }
 
 

+ 0 - 8
Jellyfin.Api/Models/StreamingDtos/StreamState.cs

@@ -47,11 +47,6 @@ namespace Jellyfin.Api.Models.StreamingDtos
             }
             }
         }
         }
 
 
-        /// <summary>
-        /// Gets or sets the transcoding throttler.
-        /// </summary>
-        public TranscodingThrottler? TranscodingThrottler { get; set; }
-
         /// <summary>
         /// <summary>
         /// Gets the video request.
         /// Gets the video request.
         /// </summary>
         /// </summary>
@@ -191,11 +186,8 @@ namespace Jellyfin.Api.Models.StreamingDtos
                 {
                 {
                     _mediaSourceManager.CloseLiveStream(MediaSource.LiveStreamId).GetAwaiter().GetResult();
                     _mediaSourceManager.CloseLiveStream(MediaSource.LiveStreamId).GetAwaiter().GetResult();
                 }
                 }
-
-                TranscodingThrottler?.Dispose();
             }
             }
 
 
-            TranscodingThrottler = null;
             TranscodingJob = null;
             TranscodingJob = null;
 
 
             _disposed = true;
             _disposed = true;