michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

improve stopping of progressive streams

Browse Source
This commit is contained in:
Luke Pulverenti 2016-08-06 10:08:38 -04:00
parent 7d5a4c078d
commit 24003580e7
3 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -349,7 +349,7 @@ namespace MediaBrowser.Api
return; return;
} }
var timerDuration = 1000; var timerDuration = 10000;
if (job.Type != TranscodingJobType.Progressive) if (job.Type != TranscodingJobType.Progressive)
{ {

18
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
View File

@ -142,7 +142,8 @@ namespace MediaBrowser.Api.Playback.Progressive
var outputPath = state.OutputFilePath; var outputPath = state.OutputFilePath;
var outputPathExists = FileSystem.FileExists(outputPath); var outputPathExists = FileSystem.FileExists(outputPath);
var isTranscodeCached = outputPathExists && !ApiEntryPoint.Instance.HasActiveTranscodingJob(outputPath, TranscodingJobType.Progressive); var transcodingJob = ApiEntryPoint.Instance.GetTranscodingJob(outputPath, TranscodingJobType.Progressive);
var isTranscodeCached = outputPathExists && transcodingJob != null;
AddDlnaHeaders(state, responseHeaders, request.Static || isTranscodeCached); AddDlnaHeaders(state, responseHeaders, request.Static || isTranscodeCached);
@ -159,6 +160,7 @@ namespace MediaBrowser.Api.Playback.Progressive
ContentType = contentType, ContentType = contentType,
IsHeadRequest = isHeadRequest, IsHeadRequest = isHeadRequest,
Path = state.MediaPath Path = state.MediaPath
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }
} }
@ -170,13 +172,25 @@ namespace MediaBrowser.Api.Playback.Progressive
try try
{ {
if (transcodingJob != null)
{
ApiEntryPoint.Instance.OnTranscodeBeginRequest(transcodingJob);
}
return await ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions return await ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions
{ {
ResponseHeaders = responseHeaders, ResponseHeaders = responseHeaders,
ContentType = contentType, ContentType = contentType,
IsHeadRequest = isHeadRequest, IsHeadRequest = isHeadRequest,
Path = outputPath, Path = outputPath,
FileShare = FileShare.ReadWrite FileShare = FileShare.ReadWrite,
OnComplete = () =>
{
if (transcodingJob != null)
{
ApiEntryPoint.Instance.OnTranscodeEndRequest(transcodingJob);
}
}
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }

10
MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
View File

@ -26,6 +26,8 @@ namespace MediaBrowser.Api.Playback.Progressive
} }
public async Task StreamFile(string path, Stream outputStream, CancellationToken cancellationToken) public async Task StreamFile(string path, Stream outputStream, CancellationToken cancellationToken)
{
try
{ {
var eofCount = 0; var eofCount = 0;
@ -53,6 +55,14 @@ namespace MediaBrowser.Api.Playback.Progressive
} }
} }
} }
finally
{
if (_job != null)
{
ApiEntryPoint.Instance.OnTranscodeEndRequest(_job);
}
}
}
private async Task<int> CopyToAsyncInternal(Stream source, Stream destination, Int32 bufferSize, CancellationToken cancellationToken) private async Task<int> CopyToAsyncInternal(Stream source, Stream destination, Int32 bufferSize, CancellationToken cancellationToken)
{ {