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

Removed memoryStream

Browse Source
This commit is contained in:
BaronGreenback
2020-09-05 20:03:21 +01:00
committed by GitHub
parent ac7636ea1e
commit d3e8834e80
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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,14 @@ 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);
// var memoryStream = new MemoryStream();
// await new ProgressiveFileCopier(outputPath, job, transcodingJobHelper, CancellationToken.None).WriteToAsync(memoryStream, CancellationToken.None).ConfigureAwait(false);
// memoryStream.Position = 0;
// return new FileStreamResult(memoryStream, contentType);
} }
finally finally
{ {