From 6f252919310ec2577c597a9fa1a7d50b36cceec4 Mon Sep 17 00:00:00 2001 From: whiteowl3 Date: Fri, 11 Mar 2022 06:54:25 +0000 Subject: allow strm probe to succeed --- MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs') diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index c41ed20cd..72be9b447 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -458,17 +458,19 @@ namespace MediaBrowser.MediaEncoding.Encoder { _logger.LogDebug("{ProcessFileName} {ProcessArgs}", process.StartInfo.FileName, process.StartInfo.Arguments); } - + using (var processWrapper = new ProcessWrapper(process, this)) { + MemoryStream 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( - process.StandardOutput.BaseStream, + memoryStream, _jsonSerializerOptions, cancellationToken: cancellationToken).ConfigureAwait(false); } -- cgit v1.2.3 From 16a449a0235661a310bac00239378334af72c0cb Mon Sep 17 00:00:00 2001 From: whiteowl3 <71030468+whiteowl3@users.noreply.github.com> Date: Wed, 23 Mar 2022 13:19:05 -0400 Subject: Apply suggestions from code review Co-authored-by: Cody Robibero --- MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs') diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 72be9b447..c74ffd94a 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -458,10 +458,9 @@ namespace MediaBrowser.MediaEncoding.Encoder { _logger.LogDebug("{ProcessFileName} {ProcessArgs}", process.StartInfo.FileName, process.StartInfo.Arguments); } - using (var processWrapper = new ProcessWrapper(process, this)) { - MemoryStream memoryStream = new MemoryStream(); + await using var memoryStream = new MemoryStream(); _logger.LogDebug("Starting ffprobe with args {Args}", args); StartProcess(processWrapper); await process.StandardOutput.BaseStream.CopyToAsync(memoryStream, cancellationToken: cancellationToken); -- cgit v1.2.3 From 6a7775de6ecd2287eff7e7bcb4e5a6bca6617855 Mon Sep 17 00:00:00 2001 From: whiteowl3 Date: Fri, 25 Mar 2022 19:08:03 +0000 Subject: empty line required by linter --- MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs') diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index c74ffd94a..c796ee780 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -458,6 +458,7 @@ namespace MediaBrowser.MediaEncoding.Encoder { _logger.LogDebug("{ProcessFileName} {ProcessArgs}", process.StartInfo.FileName, process.StartInfo.Arguments); } + using (var processWrapper = new ProcessWrapper(process, this)) { await using var memoryStream = new MemoryStream(); -- cgit v1.2.3