diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-19 12:16:33 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-19 12:16:33 -0400 |
| commit | ca0c0bdcb921cd662b2871f0f788bbec77f822d9 (patch) | |
| tree | 5ca7594043a761960323a2e7bd2d2133d36aa94c /MediaBrowser.Api/Playback/Dash/MpegDashService.cs | |
| parent | c87c516ea32b8c9bdd01f76c453b65bf24f9ce86 (diff) | |
use stream id's to close streams
Diffstat (limited to 'MediaBrowser.Api/Playback/Dash/MpegDashService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/Dash/MpegDashService.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/MediaBrowser.Api/Playback/Dash/MpegDashService.cs b/MediaBrowser.Api/Playback/Dash/MpegDashService.cs index 2655ff8ad..38b0d35d1 100644 --- a/MediaBrowser.Api/Playback/Dash/MpegDashService.cs +++ b/MediaBrowser.Api/Playback/Dash/MpegDashService.cs @@ -162,7 +162,7 @@ namespace MediaBrowser.Api.Playback.Dash // If the playlist doesn't already exist, startup ffmpeg try { - KillTranscodingJobs(request.DeviceId, playlistPath); + ApiEntryPoint.Instance.KillTranscodingJobs(request.DeviceId, request.StreamId, p => false); if (currentTranscodingIndex.HasValue) { @@ -204,11 +204,6 @@ namespace MediaBrowser.Api.Playback.Dash return await GetSegmentResult(playlistPath, segmentPath, requestedIndex, segmentLength, job ?? ApiEntryPoint.Instance.GetTranscodingJob(playlistPath, TranscodingJobType), cancellationToken).ConfigureAwait(false); } - private void KillTranscodingJobs(string deviceId, string playlistPath) - { - ApiEntryPoint.Instance.KillTranscodingJobs(j => j.Type == TranscodingJobType && string.Equals(j.DeviceId, deviceId, StringComparison.OrdinalIgnoreCase), p => !string.Equals(p, playlistPath, StringComparison.OrdinalIgnoreCase)); - } - private long GetPositionTicks(StreamState state, int requestedIndex) { if (requestedIndex <= 0) |