Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean-up code handling pipes in Engine class; Fixes #69 #77

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clean-up code handling pipes in Engine class; Fixes #69 #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 40 additions & 30 deletions src/FFmpeg.NET/Engine.cs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,28 +87,35 @@ public async Task<Stream> ConvertAsync(IInputArgument input, ConversionOptions o

public async Task ConvertAsync(IInputArgument input, Stream output, ConversionOptions options, CancellationToken cancellationToken)
{
var pipeName = $"{_pipePrefix}{Guid.NewGuid()}";
var outputPipeName = $"{_pipePrefix}{Guid.NewGuid()}";
var outputArgument = new OutputPipe(GetPipePath(outputPipeName));
var pipe = new NamedPipeServerStream(outputPipeName, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);

var parameters = new FFmpegParameters
{
Task = FFmpegTask.Convert,
Input = input,
Output = new OutputPipe(GetPipePath(pipeName)),
Output = outputArgument,
ConversionOptions = options
};

var process = CreateProcess(parameters);
var pipe = new NamedPipeServerStream(pipeName, PipeDirection.InOut, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);

await pipe.WaitForConnectionAsync(cancellationToken);
await Task.WhenAll(
pipe.CopyToAsync(output, cancellationToken),
process.ExecuteAsync(cancellationToken).ContinueWith(x =>
{
pipe.Disconnect();
pipe.Dispose();
}, cancellationToken)
).ConfigureAwait(false);
Cleanup(process);
var ffmpegProcess = CreateProcess(parameters);
try
{
var executeProcess = ffmpegProcess.ExecuteAsync(cancellationToken);
var copyData = pipe.WaitForConnectionAsync(cancellationToken)
.ContinueWith(async x =>
{
await pipe.CopyToAsync(output, cancellationToken);
}, cancellationToken).Unwrap();
await Task.WhenAll(executeProcess, copyData).ConfigureAwait(false);
pipe.Disconnect();
}
finally
{
pipe.Dispose();
Cleanup(ffmpegProcess);
}
}

public async Task ConvertAsync(IArgument argument, Stream output, CancellationToken cancellationToken)
Expand All @@ -119,21 +126,24 @@ public async Task ConvertAsync(IArgument argument, Stream output, CancellationTo

var arguments = argument.Argument + $" {outputArgument.Argument}";
var parameters = new FFmpegParameters { CustomArguments = arguments };
var process = CreateProcess(parameters);

await Task.WhenAll(
pipe.WaitForConnectionAsync(cancellationToken).ContinueWith(async x =>
{
await pipe.CopyToAsync(output, cancellationToken);
}),
process.ExecuteAsync(cancellationToken).ContinueWith(x =>
{
pipe.Disconnect();
pipe.Dispose();
}, cancellationToken)
).ConfigureAwait(false);

Cleanup(process);

var ffmpegProcess = CreateProcess(parameters);
try
{
var executeProcess = ffmpegProcess.ExecuteAsync(cancellationToken);
var copyData = pipe.WaitForConnectionAsync(cancellationToken)
.ContinueWith(async x =>
{
await pipe.CopyToAsync(output, cancellationToken);
}, cancellationToken).Unwrap();
await Task.WhenAll(executeProcess, copyData).ConfigureAwait(false);
pipe.Disconnect();
}
finally
{
pipe.Dispose();
Cleanup(ffmpegProcess);
}
}

private async Task ExecuteAsync(FFmpegParameters parameters, CancellationToken cancellationToken)
Expand Down