diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-04-10 18:16:41 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-04-10 18:16:41 -0400 |
| commit | 17f5ae811817b0d891b2884d7a4adefc18bfaf3f (patch) | |
| tree | 092aedc05574fa9d706ad51f5ccb6cc170637315 /MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | |
| parent | 3a00f003f52f94ecc74634a6ad395fb38d019a88 (diff) | |
improve ffmpeg killing
Diffstat (limited to 'MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs index 98d6c9a76..455113da9 100644 --- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs @@ -144,7 +144,6 @@ namespace MediaBrowser.Api.Playback.Hls request.StartTimeTicks = GetSeekPositionTicks(state, requestedIndex); job = await StartFfMpeg(state, playlistPath, cancellationTokenSource).ConfigureAwait(false); - ApiEntryPoint.Instance.OnTranscodeBeginRequest(job); } catch { @@ -154,6 +153,14 @@ namespace MediaBrowser.Api.Playback.Hls await WaitForMinimumSegmentCount(playlistPath, 1, cancellationTokenSource.Token).ConfigureAwait(false); } + else + { + job = ApiEntryPoint.Instance.OnTranscodeBeginRequest(playlistPath, TranscodingJobType); + if (job.TranscodingThrottler != null) + { + job.TranscodingThrottler.UnpauseTranscoding(); + } + } } } finally |