starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-26 10:44:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add more logging

Browse Source 
Trying to fix hls muxer plus ffmpeg 4.1+ combo

Try to fix waiting for segment being ready

This is needed because hls muxer in ffmpeg >= 4.1 creates the
playlist only when it finishes transcoding.

Also cleaned up logs a bit.

Lower log level for "StartFfmpeg finished" to debug
This commit is contained in:
Vasily
2019-10-03 18:50:39 +03:00
parent 6746f708f2
commit c1f9107b8b
3 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,6 +243,7 @@ namespace MediaBrowser.Api.Playback.Hls
request.StartTimeTicks = GetStartPositionTicks(state, requestedIndex);
state.WaitForPath = segmentPath;
job = await StartFfMpeg(state, playlistPath, cancellationTokenSource).ConfigureAwait(false);
}
catch
@@ -458,16 +459,15 @@ namespace MediaBrowser.Api.Playback.Hls
TranscodingJob transcodingJob,
CancellationToken cancellationToken)
{
var segmentFileExists = File.Exists(segmentPath);
// If all transcoding has completed, just return immediately
if (transcodingJob != null && transcodingJob.HasExited && segmentFileExists)
var segmentExists = File.Exists(segmentPath);
if (segmentExists)
{
return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false);
}
if (transcodingJob != null && transcodingJob.HasExited)
{
// Transcoding job is over, so assume all existing files are ready
return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false);
}
if (segmentFileExists)
{
var currentTranscodingIndex = GetCurrentTranscodingIndex(playlistPath, segmentExtension);
// If requested segment is less than transcoding position, we can't transcode backwards, so assume it's ready
@@ -477,33 +477,26 @@ namespace MediaBrowser.Api.Playback.Hls
}
}
var segmentFilename = Path.GetFileName(segmentPath);
var nextSegmentPath = GetSegmentPath(state, playlistPath, segmentIndex + 1);
while (!cancellationToken.IsCancellationRequested)
{
try
// To be considered ready, the segment file has to exist AND
// either the transcoding job should be done or next segment should also exit
if (segmentExists)
{
var text = File.ReadAllText(playlistPath, Encoding.UTF8);
// If it appears in the playlist, it's done
if (text.IndexOf(segmentFilename, StringComparison.OrdinalIgnoreCase) != -1)
if ((transcodingJob != null && transcodingJob.HasExited) || File.Exists(nextSegmentPath))
{
if (!segmentFileExists)
{
segmentFileExists = File.Exists(segmentPath);
}
if (segmentFileExists)
{
return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false);
}
//break;
return await GetSegmentResult(state, segmentPath, segmentIndex, transcodingJob).ConfigureAwait(false);
}
}
catch (IOException)
else
{
// May get an error if the file is locked
segmentExists = File.Exists(segmentPath);
if (segmentExists)
{
continue; // avoid unnecessary waiting if segment just became available
}
}
await Task.Delay(100, cancellationToken).ConfigureAwait(false);
}