Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 07:10:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4063 from BaronGreenback/FilestreamResponse

Browse source 
Our of Memory fix when streaming large files
This commit is contained in:
Bond-009 2020-09-07 20:00:23 +00:00 committed by GitHub
parent 23f6616e63 15e064cb73
commit c585af3177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs
View file

@ -1,4 +1,4 @@
using System; using System;
using System.IO; using System.IO;
using System.Net.Http; using System.Net.Http;
using System.Threading; using System.Threading;
@ -123,10 +123,9 @@ namespace Jellyfin.Api.Helpers
state.Dispose(); state.Dispose();
} }
var memoryStream = new MemoryStream(); await new ProgressiveFileCopier(outputPath, job, transcodingJobHelper, CancellationToken.None)
await new ProgressiveFileCopier(outputPath, job, transcodingJobHelper, CancellationToken.None).WriteToAsync(memoryStream, CancellationToken.None).ConfigureAwait(false); .WriteToAsync(httpContext.Response.Body, CancellationToken.None).ConfigureAwait(false);
memoryStream.Position = 0; return new FileStreamResult(httpContext.Response.Body, contentType);
return new FileStreamResult(memoryStream, contentType);
} }
finally finally
{ {

1
Jellyfin.Api/Helpers/StreamingHelpers.cs
View file

@ -92,7 +92,6 @@ namespace Jellyfin.Api.Helpers
} }
var enableDlnaHeaders = !string.IsNullOrWhiteSpace(streamingRequest.Params) || var enableDlnaHeaders = !string.IsNullOrWhiteSpace(streamingRequest.Params) ||
streamingRequest.StreamOptions.ContainsKey("dlnaheaders") ||
string.Equals(httpRequest.Headers["GetContentFeatures.DLNA.ORG"], "1", StringComparison.OrdinalIgnoreCase); string.Equals(httpRequest.Headers["GetContentFeatures.DLNA.ORG"], "1", StringComparison.OrdinalIgnoreCase);
var state = new StreamState(mediaSourceManager, transcodingJobType, transcodingJobHelper) var state = new StreamState(mediaSourceManager, transcodingJobType, transcodingJobHelper)