aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaronGreenback <jimcartlidge@yahoo.co.uk>2020-09-05 20:03:21 +0100
committerGitHub <noreply@github.com>2020-09-05 20:03:21 +0100
commitd3e8834e807ebba78ada3a726ceea8dc37de8950 (patch)
tree5f84b33bed1d4adab07ff3496150af2b4c612779
parentac7636ea1ea9b028e98b8f59588ba82ebfffda89 (diff)
Removed memoryStream
-rw-r--r--Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs14
1 files changed, 9 insertions, 5 deletions
diff --git a/Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs b/Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs
index 884bfbe44..6af1b3791 100644
--- a/Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs
+++ b/Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.IO;
using System.Net.Http;
using System.Threading;
@@ -123,10 +123,14 @@ namespace Jellyfin.Api.Helpers
state.Dispose();
}
- 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);
+ await new ProgressiveFileCopier(outputPath, job, transcodingJobHelper, CancellationToken.None)
+ .WriteToAsync(httpContext.Response.Body, CancellationToken.None).ConfigureAwait(false);
+ return new FileStreamResult(httpContext.Response.Body, 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
{