Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't start waiting for a segment which doesn't exist if transcoding is not running

Browse Source
This commit is contained in:
Vasily 2019-10-08 17:00:16 +03:00
parent 7aea9266d0
commit 3740228100
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@ -482,7 +482,9 @@ namespace MediaBrowser.Api.Playback.Hls
} }
var nextSegmentPath = GetSegmentPath(state, playlistPath, segmentIndex + 1); var nextSegmentPath = GetSegmentPath(state, playlistPath, segmentIndex + 1);
while (!cancellationToken.IsCancellationRequested && transcodingJob != null && !transcodingJob.HasExited) if (transcodingJob != null)
{
while (!cancellationToken.IsCancellationRequested && !transcodingJob.HasExited)
{ {
// To be considered ready, the segment file has to exist AND // To be considered ready, the segment file has to exist AND
// either the transcoding job should be done or next segment should also exist // either the transcoding job should be done or next segment should also exist
@ -514,6 +516,12 @@ namespace MediaBrowser.Api.Playback.Hls
{ {
Logger.LogDebug("serving {0} as it's on disk and transcoding stopped", segmentPath); Logger.LogDebug("serving {0} as it's on disk and transcoding stopped", segmentPath);
} }
}
else
{
Logger.LogWarning("cannot serve {0} as it doesn't exist and no transcode is running", segmentPath);
}
return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false); return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false);
} }