diff options
Diffstat (limited to 'MediaBrowser.Api/Playback/Hls/VideoHlsService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index 346af016e..3581b9e17 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -81,18 +81,7 @@ namespace MediaBrowser.Api.Playback.Hls file = Path.Combine(ServerConfigurationManager.ApplicationPaths.TranscodingTempPath, file); - OnBeginRequest(request.PlaylistId); - - return ResultFactory.GetStaticFileResult(Request, file); - } - - /// <summary> - /// Called when [begin request]. - /// </summary> - /// <param name="playlistId">The playlist id.</param> - protected void OnBeginRequest(string playlistId) - { - var normalizedPlaylistId = playlistId.Replace("-low", string.Empty); + var normalizedPlaylistId = request.PlaylistId.Replace("-low", string.Empty); foreach (var playlist in Directory.EnumerateFiles(ServerConfigurationManager.ApplicationPaths.TranscodingTempPath, "*.m3u8") .Where(i => i.IndexOf(normalizedPlaylistId, StringComparison.OrdinalIgnoreCase) != -1) @@ -100,15 +89,20 @@ namespace MediaBrowser.Api.Playback.Hls { ExtendPlaylistTimer(playlist); } + + return ResultFactory.GetStaticFileResult(Request, file); } private async void ExtendPlaylistTimer(string playlist) { - ApiEntryPoint.Instance.OnTranscodeBeginRequest(playlist, TranscodingJobType.Hls); + var job = ApiEntryPoint.Instance.OnTranscodeBeginRequest(playlist, TranscodingJobType.Hls); await Task.Delay(20000).ConfigureAwait(false); - ApiEntryPoint.Instance.OnTranscodeEndRequest(playlist, TranscodingJobType.Hls); + if (job != null) + { + ApiEntryPoint.Instance.OnTranscodeEndRequest(job); + } } /// <summary> |