diff options
Diffstat (limited to 'MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs index 471bfe604..ab2cab224 100644 --- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs @@ -421,7 +421,7 @@ namespace MediaBrowser.Api.Playback.Hls // If all transcoding has completed, just return immediately if (transcodingJob != null && transcodingJob.HasExited && FileSystem.FileExists(segmentPath)) { - return GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob); + return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false); } var segmentFilename = Path.GetFileName(segmentPath); @@ -441,7 +441,7 @@ namespace MediaBrowser.Api.Playback.Hls { if (FileSystem.FileExists(segmentPath)) { - return GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob); + return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false); } //break; } @@ -457,10 +457,10 @@ namespace MediaBrowser.Api.Playback.Hls } cancellationToken.ThrowIfCancellationRequested(); - return GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob); + return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false); } - private object GetSegmentResult(StreamState state, string segmentPath, int index, TranscodingJob transcodingJob) + private Task<object> GetSegmentResult(StreamState state, string segmentPath, int index, TranscodingJob transcodingJob) { var segmentEndingPositionTicks = GetEndPositionTicks(state, index); @@ -476,7 +476,7 @@ namespace MediaBrowser.Api.Playback.Hls ApiEntryPoint.Instance.OnTranscodeEndRequest(transcodingJob); } } - }).Result; + }); } private async Task<object> GetMasterPlaylistInternal(StreamRequest request, string method) |