aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorCody Robibero <cody@robibe.ro>2022-03-25 13:33:10 -0600
committerGitHub <noreply@github.com>2022-03-25 13:33:10 -0600
commit8056b0e961a9e840ab13340f48816fa1194ad9cf (patch)
tree6a959c7512abae663d65a46fef3fac32f73eb0a5 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parentc229f3ae0a0991e5c764706b69cf6cb08c4a19e8 (diff)
parent6a7775de6ecd2287eff7e7bcb4e5a6bca6617855 (diff)
Merge pull request #7443 from whiteowl3/strm-probe
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index c41ed20cd..c796ee780 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -461,14 +461,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
using (var processWrapper = new ProcessWrapper(process, this))
{
+ await using var memoryStream = new MemoryStream();
_logger.LogDebug("Starting ffprobe with args {Args}", args);
StartProcess(processWrapper);
-
+ await process.StandardOutput.BaseStream.CopyToAsync(memoryStream, cancellationToken: cancellationToken);
+ memoryStream.Seek(0, SeekOrigin.Begin);
InternalMediaInfoResult result;
try
{
result = await JsonSerializer.DeserializeAsync<InternalMediaInfoResult>(
- process.StandardOutput.BaseStream,
+ memoryStream,
_jsonSerializerOptions,
cancellationToken: cancellationToken).ConfigureAwait(false);
}