Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2024-11-10 08:34:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass cancellation token through all input output tasks

Browse source 
Former-commit-id: b854d5b43b
This commit is contained in:
Malte Rosenbjerg 2020-05-11 00:34:17 +02:00
parent 563b5632f9
commit 27fc3eaa28
11 changed files with 30 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
FFMpegCore/Extend/BitmapVideoFrameWrapper.cs
View file

@ -2,6 +2,7 @@
using System.Drawing;
using System.Drawing.Imaging;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using FFMpegCore.Pipes;
@ -39,7 +40,7 @@ public void Serialize(System.IO.Stream stream)
}
}
public async Task SerializeAsync(System.IO.Stream stream)
public async Task SerializeAsync(System.IO.Stream stream, CancellationToken token)
{
var data = Source.LockBits(new Rectangle(0, 0, Width, Height), ImageLockMode.ReadOnly, Source.PixelFormat);
@ -47,7 +48,7 @@ public async Task SerializeAsync(System.IO.Stream stream)
{
var buffer = new byte[data.Stride * data.Height];
Marshal.Copy(data.Scan0, buffer, 0, buffer.Length);
await stream.WriteAsync(buffer, 0, buffer.Length);
await stream.WriteAsync(buffer, 0, buffer.Length, token);
}
finally
{

4
FFMpegCore/FFMpeg/Arguments/InputPipeArgument.cs
View file

@ -8,7 +8,7 @@ namespace FFMpegCore.Arguments
/// <summary>
/// Represents input parameter for a named pipe
/// </summary>
public class InputPipeArgument : PipeArgument
public class InputPipeArgument : PipeArgument, IInputArgument
{
public readonly IPipeDataWriter Writer;
@ -24,7 +24,7 @@ public override async Task ProcessDataAsync(CancellationToken token)
await Pipe.WaitForConnectionAsync(token).ConfigureAwait(false);
if (!Pipe.IsConnected)
throw new TaskCanceledException();
await Writer.WriteDataAsync(Pipe).ConfigureAwait(false);
await Writer.WriteDataAsync(Pipe, token).ConfigureAwait(false);
}
}
}

4
FFMpegCore/FFMpeg/Arguments/OutputPipeArgument.cs
View file

@ -5,7 +5,7 @@
namespace FFMpegCore.Arguments
{
public class OutputPipeArgument : PipeArgument
public class OutputPipeArgument : PipeArgument, IOutputArgument
{
public readonly IPipeDataReader Reader;
@ -21,7 +21,7 @@ public override async Task ProcessDataAsync(CancellationToken token)
await Pipe.WaitForConnectionAsync(token).ConfigureAwait(false);
if (!Pipe.IsConnected)
throw new TaskCanceledException();
await Reader.ReadDataAsync(Pipe).ConfigureAwait(false);
await Reader.ReadDataAsync(Pipe, token).ConfigureAwait(false);
}
}
}

2
FFMpegCore/FFMpeg/Arguments/PipeArgument.cs
View file

@ -6,7 +6,7 @@
namespace FFMpegCore.Arguments
{
public abstract class PipeArgument : IInputArgument, IOutputArgument
public abstract class PipeArgument
{
private string PipeName { get; }
public string PipePath => PipeHelpers.GetPipePath(PipeName);

4
FFMpegCore/FFMpeg/FFMpegArguments.cs
View file

@ -102,9 +102,9 @@ internal void Pre()
_inputArgument.Pre();
_outputArgument.Pre();
}
internal Task During(CancellationToken? cancellationToken = null)
internal async Task During(CancellationToken? cancellationToken = null)
{
return Task.WhenAll(_inputArgument.During(cancellationToken), _outputArgument.During(cancellationToken));
await Task.WhenAll(_inputArgument.During(cancellationToken), _outputArgument.During(cancellationToken)).ConfigureAwait(false);
}
internal void Post()
{

5
FFMpegCore/FFMpeg/Pipes/IPipeDataReader.cs
View file

@ -1,11 +1,12 @@
using System.Threading.Tasks;
using System.Threading;
using System.Threading.Tasks;
namespace FFMpegCore.Pipes
{
public interface IPipeDataReader
{
void ReadData(System.IO.Stream stream);
Task ReadDataAsync(System.IO.Stream stream);
Task ReadDataAsync(System.IO.Stream stream, CancellationToken token);
string GetFormat();
}
}

5
FFMpegCore/FFMpeg/Pipes/IPipeDataWriter.cs
View file

@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System.Threading;
using System.Threading.Tasks;
namespace FFMpegCore.Pipes
{
@ -9,6 +10,6 @@ public interface IPipeDataWriter
{
string GetFormat();
void WriteData(System.IO.Stream pipe);
Task WriteDataAsync(System.IO.Stream pipe);
Task WriteDataAsync(System.IO.Stream pipe, CancellationToken token);
}
}

5
FFMpegCore/FFMpeg/Pipes/IVideoFrame.cs
View file

@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System.Threading;
using System.Threading.Tasks;
namespace FFMpegCore.Pipes
{
@ -12,6 +13,6 @@ public interface IVideoFrame
string Format { get; }
void Serialize(System.IO.Stream pipe);
Task SerializeAsync(System.IO.Stream pipe);
Task SerializeAsync(System.IO.Stream pipe, CancellationToken token);
}
}

7
FFMpegCore/FFMpeg/Pipes/RawVideoPipeDataWriter.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using FFMpegCore.Exceptions;
@ -59,16 +60,16 @@ public void WriteData(System.IO.Stream stream)
}
}
public async Task WriteDataAsync(System.IO.Stream stream)
public async Task WriteDataAsync(System.IO.Stream stream, CancellationToken token)
{
if (_framesEnumerator.Current != null)
{
await _framesEnumerator.Current.SerializeAsync(stream).ConfigureAwait(false);
await _framesEnumerator.Current.SerializeAsync(stream, token).ConfigureAwait(false);
}
while (_framesEnumerator.MoveNext())
{
await _framesEnumerator.Current!.SerializeAsync(stream).ConfigureAwait(false);
await _framesEnumerator.Current!.SerializeAsync(stream, token).ConfigureAwait(false);
}
}

7
FFMpegCore/FFMpeg/Pipes/StreamPipeDataReader.cs
View file

@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System.Threading;
using System.Threading.Tasks;
namespace FFMpegCore.Pipes
{
@ -16,8 +17,8 @@ public StreamPipeDataReader(System.IO.Stream destanationStream)
public void ReadData(System.IO.Stream stream) =>
stream.CopyTo(DestanationStream, BlockSize);
public Task ReadDataAsync(System.IO.Stream stream) =>
stream.CopyToAsync(DestanationStream, BlockSize);
public Task ReadDataAsync(System.IO.Stream stream, CancellationToken token) =>
stream.CopyToAsync(DestanationStream, BlockSize, token);
public string GetFormat()
{

5
FFMpegCore/FFMpeg/Pipes/StreamPipeDataWriter.cs
View file

@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System.Threading;
using System.Threading.Tasks;
namespace FFMpegCore.Pipes
{
@ -18,7 +19,7 @@ public StreamPipeDataWriter(System.IO.Stream stream)
public void WriteData(System.IO.Stream pipe) => Source.CopyTo(pipe, BlockSize);
public Task WriteDataAsync(System.IO.Stream pipe) => Source.CopyToAsync(pipe, BlockSize);
public Task WriteDataAsync(System.IO.Stream pipe, CancellationToken token) => Source.CopyToAsync(pipe, BlockSize, token);
public string GetFormat() => StreamFormat;
}