From 4eafa4533cbdf68ba63e0c91a1f414740e04d8cb Mon Sep 17 00:00:00 2001 From: Julien Loir Date: Mon, 12 Apr 2021 13:48:55 +0200 Subject: [PATCH] Move `System.IO` in `using`s on some classes Former-commit-id: e10657169ea002cee05e7cd3d809ec936d678cfb --- FFMpegCore/Extend/BitmapVideoFrameWrapper.cs | 9 +++++---- FFMpegCore/FFMpeg/Pipes/IPipeSink.cs | 5 +++-- FFMpegCore/FFMpeg/Pipes/IPipeSource.cs | 5 +++-- FFMpegCore/FFMpeg/Pipes/IVideoFrame.cs | 7 ++++--- FFMpegCore/FFMpeg/Pipes/RawVideoPipeSource.cs | 3 ++- FFMpegCore/FFMpeg/Pipes/StreamPipeSink.cs | 2 +- FFMpegCore/FFMpeg/Pipes/StreamPipeSource.cs | 5 +++-- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/FFMpegCore/Extend/BitmapVideoFrameWrapper.cs b/FFMpegCore/Extend/BitmapVideoFrameWrapper.cs index e2f0737..36790d4 100644 --- a/FFMpegCore/Extend/BitmapVideoFrameWrapper.cs +++ b/FFMpegCore/Extend/BitmapVideoFrameWrapper.cs @@ -1,10 +1,11 @@ -using System; +using FFMpegCore.Pipes; +using System; using System.Drawing; using System.Drawing.Imaging; +using System.IO; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using FFMpegCore.Pipes; namespace FFMpegCore.Extend { @@ -24,7 +25,7 @@ public BitmapVideoFrameWrapper(Bitmap bitmap) Format = ConvertStreamFormat(bitmap.PixelFormat); } - public void Serialize(System.IO.Stream stream) + public void Serialize(Stream stream) { var data = Source.LockBits(new Rectangle(0, 0, Width, Height), ImageLockMode.ReadOnly, Source.PixelFormat); @@ -40,7 +41,7 @@ public void Serialize(System.IO.Stream stream) } } - public async Task SerializeAsync(System.IO.Stream stream, CancellationToken token) + public async Task SerializeAsync(Stream stream, CancellationToken token) { var data = Source.LockBits(new Rectangle(0, 0, Width, Height), ImageLockMode.ReadOnly, Source.PixelFormat); diff --git a/FFMpegCore/FFMpeg/Pipes/IPipeSink.cs b/FFMpegCore/FFMpeg/Pipes/IPipeSink.cs index 875407e..e5f2bf4 100644 --- a/FFMpegCore/FFMpeg/Pipes/IPipeSink.cs +++ b/FFMpegCore/FFMpeg/Pipes/IPipeSink.cs @@ -1,11 +1,12 @@ -using System.Threading; +using System.IO; +using System.Threading; using System.Threading.Tasks; namespace FFMpegCore.Pipes { public interface IPipeSink { - Task ReadAsync(System.IO.Stream inputStream, CancellationToken cancellationToken); + Task ReadAsync(Stream inputStream, CancellationToken cancellationToken); string GetFormat(); } } diff --git a/FFMpegCore/FFMpeg/Pipes/IPipeSource.cs b/FFMpegCore/FFMpeg/Pipes/IPipeSource.cs index cdd5139..c250421 100644 --- a/FFMpegCore/FFMpeg/Pipes/IPipeSource.cs +++ b/FFMpegCore/FFMpeg/Pipes/IPipeSource.cs @@ -1,4 +1,5 @@ -using System.Threading; +using System.IO; +using System.Threading; using System.Threading.Tasks; namespace FFMpegCore.Pipes @@ -9,6 +10,6 @@ namespace FFMpegCore.Pipes public interface IPipeSource { string GetStreamArguments(); - Task WriteAsync(System.IO.Stream outputStream, CancellationToken cancellationToken); + Task WriteAsync(Stream outputStream, CancellationToken cancellationToken); } } diff --git a/FFMpegCore/FFMpeg/Pipes/IVideoFrame.cs b/FFMpegCore/FFMpeg/Pipes/IVideoFrame.cs index 094040b..dd583d9 100644 --- a/FFMpegCore/FFMpeg/Pipes/IVideoFrame.cs +++ b/FFMpegCore/FFMpeg/Pipes/IVideoFrame.cs @@ -1,4 +1,5 @@ -using System.Threading; +using System.IO; +using System.Threading; using System.Threading.Tasks; namespace FFMpegCore.Pipes @@ -12,7 +13,7 @@ public interface IVideoFrame int Height { get; } string Format { get; } - void Serialize(System.IO.Stream pipe); - Task SerializeAsync(System.IO.Stream pipe, CancellationToken token); + void Serialize(Stream pipe); + Task SerializeAsync(Stream pipe, CancellationToken token); } } diff --git a/FFMpegCore/FFMpeg/Pipes/RawVideoPipeSource.cs b/FFMpegCore/FFMpeg/Pipes/RawVideoPipeSource.cs index 65f622e..0e3ab61 100644 --- a/FFMpegCore/FFMpeg/Pipes/RawVideoPipeSource.cs +++ b/FFMpegCore/FFMpeg/Pipes/RawVideoPipeSource.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.IO; using System.Threading; using System.Threading.Tasks; using FFMpegCore.Exceptions; @@ -46,7 +47,7 @@ public string GetStreamArguments() return $"-f rawvideo -r {FrameRate.ToString(CultureInfo.InvariantCulture)} -pix_fmt {StreamFormat} -s {Width}x{Height}"; } - public async Task WriteAsync(System.IO.Stream outputStream, CancellationToken cancellationToken) + public async Task WriteAsync(Stream outputStream, CancellationToken cancellationToken) { if (_framesEnumerator.Current != null) { diff --git a/FFMpegCore/FFMpeg/Pipes/StreamPipeSink.cs b/FFMpegCore/FFMpeg/Pipes/StreamPipeSink.cs index cd13f40..addc14e 100644 --- a/FFMpegCore/FFMpeg/Pipes/StreamPipeSink.cs +++ b/FFMpegCore/FFMpeg/Pipes/StreamPipeSink.cs @@ -20,7 +20,7 @@ public StreamPipeSink(Stream destination) Writer = (inputStream, cancellationToken) => inputStream.CopyToAsync(destination, BlockSize, cancellationToken); } - public Task ReadAsync(System.IO.Stream inputStream, CancellationToken cancellationToken) + public Task ReadAsync(Stream inputStream, CancellationToken cancellationToken) => Writer(inputStream, cancellationToken); public string GetFormat() => Format; diff --git a/FFMpegCore/FFMpeg/Pipes/StreamPipeSource.cs b/FFMpegCore/FFMpeg/Pipes/StreamPipeSource.cs index 404029f..87eaee7 100644 --- a/FFMpegCore/FFMpeg/Pipes/StreamPipeSource.cs +++ b/FFMpegCore/FFMpeg/Pipes/StreamPipeSource.cs @@ -1,4 +1,5 @@ -using System.Threading; +using System.IO; +using System.Threading; using System.Threading.Tasks; namespace FFMpegCore.Pipes @@ -19,6 +20,6 @@ public StreamPipeSource(System.IO.Stream source) public string GetStreamArguments() => StreamFormat; - public Task WriteAsync(System.IO.Stream outputStream, CancellationToken cancellationToken) => Source.CopyToAsync(outputStream, BlockSize, cancellationToken); + public Task WriteAsync(Stream outputStream, CancellationToken cancellationToken) => Source.CopyToAsync(outputStream, BlockSize, cancellationToken); } }