Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-04 22:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: accessing Standard* of a Process requires manually disposing them afterwards (#10125)

Browse Source
This commit is contained in:
Claus Vium 2023-08-20 20:06:57 +02:00 committed by GitHub
parent 260680d727
commit 956e3dab43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 56 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Api/Helpers/TranscodingJobHelper.cs
View File

@ -620,7 +620,7 @@ public class TranscodingJobHelper : IDisposable
state.TranscodingJob = transcodingJob; state.TranscodingJob = transcodingJob;
// Important - don't await the log task or we won't be able to kill FFmpeg when the user stops playback // Important - don't await the log task or we won't be able to kill FFmpeg when the user stops playback
_ = new JobLogger(_logger).StartStreamingLog(state, process.StandardError.BaseStream, logStream); _ = new JobLogger(_logger).StartStreamingLog(state, process.StandardError, logStream);
// Wait for the file to exist before proceeding // Wait for the file to exist before proceeding
var ffmpegTargetFile = state.WaitForPath ?? outputPath; var ffmpegTargetFile = state.WaitForPath ?? outputPath;

4
MediaBrowser.Controller/MediaEncoding/JobLogger.cs
View File

@ -20,12 +20,12 @@ namespace MediaBrowser.Controller.MediaEncoding
_logger = logger; _logger = logger;
} }
public async Task StartStreamingLog(EncodingJobInfo state, Stream source, Stream target) public async Task StartStreamingLog(EncodingJobInfo state, StreamReader reader, Stream target)
{ {
try try
{ {
using (target) using (target)
using (var reader = new StreamReader(source)) using (reader)
{ {
while (!reader.EndOfStream && reader.BaseStream.CanRead) while (!reader.EndOfStream && reader.BaseStream.CanRead)
{ {

13
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@ -553,7 +553,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
private string GetProcessOutput(string path, string arguments, bool readStdErr, string? testKey) private string GetProcessOutput(string path, string arguments, bool readStdErr, string? testKey)
{ {
using (var process = new Process() var redirectStandardIn = !string.IsNullOrEmpty(testKey);
using (var process = new Process
{ {
StartInfo = new ProcessStartInfo(path, arguments) StartInfo = new ProcessStartInfo(path, arguments)
{ {
@ -561,7 +562,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
UseShellExecute = false, UseShellExecute = false,
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false, ErrorDialog = false,
RedirectStandardInput = !string.IsNullOrEmpty(testKey), RedirectStandardInput = redirectStandardIn,
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = true RedirectStandardError = true
} }
@ -571,12 +572,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
process.Start(); process.Start();
if (!string.IsNullOrEmpty(testKey)) if (redirectStandardIn)
{ {
process.StandardInput.Write(testKey); using var writer = process.StandardInput;
writer.Write(testKey);
} }
return readStdErr ? process.StandardError.ReadToEnd() : process.StandardOutput.ReadToEnd(); using var reader = readStdErr ? process.StandardError : process.StandardOutput;
return reader.ReadToEnd();
} }
} }
} }

3
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -511,7 +511,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
using (var processWrapper = new ProcessWrapper(process, this)) using (var processWrapper = new ProcessWrapper(process, this))
{ {
StartProcess(processWrapper); StartProcess(processWrapper);
await process.StandardOutput.BaseStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false); using var reader = process.StandardOutput;
await reader.BaseStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
memoryStream.Seek(0, SeekOrigin.Begin); memoryStream.Seek(0, SeekOrigin.Begin);
InternalMediaInfoResult result; InternalMediaInfoResult result;
try try

3
MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
View File

@ -130,7 +130,8 @@ namespace MediaBrowser.Providers.MediaInfo
throw; throw;
} }
output = await process.StandardError.ReadToEndAsync(cancellationToken).ConfigureAwait(false); using var reader = process.StandardError;
output = await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false);
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
MatchCollection split = LUFSRegex().Matches(output); MatchCollection split = LUFSRegex().Matches(output);

3
src/Jellyfin.MediaEncoding.Keyframes/FfProbe/FfProbeKeyframeExtractor.cs
View File

@ -68,6 +68,8 @@ public static class FfProbeKeyframeExtractor
double streamDuration = 0; double streamDuration = 0;
double formatDuration = 0; double formatDuration = 0;
using (reader)
{
while (!reader.EndOfStream) while (!reader.EndOfStream)
{ {
var line = reader.ReadLine().AsSpan(); var line = reader.ReadLine().AsSpan();
@ -115,4 +117,5 @@ public static class FfProbeKeyframeExtractor
return new KeyframeData(TimeSpan.FromSeconds(duration).Ticks, keyframes); return new KeyframeData(TimeSpan.FromSeconds(duration).Ticks, keyframes);
} }
}
} }