Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2024-09-20 05:22:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup in using directives

Browse source 
Former-commit-id: 6c3129d417
This commit is contained in:
Malte Rosenbjerg 2021-05-15 11:17:12 +02:00
parent 0ceff3aa50
commit 33878ab605
11 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
FFMpegCore.Test/AudioTest.cs
View file

@ -1,5 +1,4 @@
using System; using System;
using FFMpegCore.Enums;
using FFMpegCore.Test.Resources; using FFMpegCore.Test.Resources;
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.IO; using System.IO;

6
FFMpegCore.Test/Resources/TestResources.cs
View file

@ -1,8 +1,4 @@
using System; namespace FFMpegCore.Test.Resources
using System.IO;
using FFMpegCore.Enums;
namespace FFMpegCore.Test.Resources
{ {
public enum AudioType public enum AudioType
{ {

5
FFMpegCore/Extend/BitmapVideoFrameWrapper.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -24,7 +25,7 @@ public BitmapVideoFrameWrapper(Bitmap bitmap)
Format = ConvertStreamFormat(bitmap.PixelFormat); 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); 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); var data = Source.LockBits(new Rectangle(0, 0, Width, Height), ImageLockMode.ReadOnly, Source.PixelFormat);

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

@ -1,7 +1,5 @@
using FFMpegCore.Enums; using FFMpegCore.Enums;
using System; using System;
using System.Collections.Generic;
using System.Text;
namespace FFMpegCore.Arguments namespace FFMpegCore.Arguments
{ {

1
FFMpegCore/FFMpeg/Arguments/SizeArgument.cs
View file

@ -1,5 +1,4 @@
using System.Drawing; using System.Drawing;
using FFMpegCore.Enums;
namespace FFMpegCore.Arguments namespace FFMpegCore.Arguments
{ {

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

@ -1,11 +1,12 @@
using System.Threading; using System.IO;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace FFMpegCore.Pipes namespace FFMpegCore.Pipes
{ {
public interface IPipeSink public interface IPipeSink
{ {
Task ReadAsync(System.IO.Stream inputStream, CancellationToken cancellationToken); Task ReadAsync(Stream inputStream, CancellationToken cancellationToken);
string GetFormat(); string GetFormat();
} }
} }

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

@ -1,4 +1,5 @@
using System.Threading; using System.IO;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace FFMpegCore.Pipes namespace FFMpegCore.Pipes
@ -9,6 +10,6 @@ namespace FFMpegCore.Pipes
public interface IPipeSource public interface IPipeSource
{ {
string GetStreamArguments(); string GetStreamArguments();
Task WriteAsync(System.IO.Stream outputStream, CancellationToken cancellationToken); Task WriteAsync(Stream outputStream, CancellationToken cancellationToken);
} }
} }

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

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

3
FFMpegCore/FFMpeg/Pipes/RawVideoPipeSource.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using FFMpegCore.Exceptions; 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}"; 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) if (_framesEnumerator.Current != null)
{ {

2
FFMpegCore/FFMpeg/Pipes/StreamPipeSink.cs
View file

@ -20,7 +20,7 @@ public StreamPipeSink(Stream destination)
Writer = (inputStream, cancellationToken) => inputStream.CopyToAsync(destination, BlockSize, cancellationToken); 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); => Writer(inputStream, cancellationToken);
public string GetFormat() => Format; public string GetFormat() => Format;

9
FFMpegCore/FFMpeg/Pipes/StreamPipeSource.cs
View file

@ -1,4 +1,5 @@
using System.Threading; using System.IO;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace FFMpegCore.Pipes namespace FFMpegCore.Pipes
@ -8,17 +9,17 @@ namespace FFMpegCore.Pipes
/// </summary> /// </summary>
public class StreamPipeSource : IPipeSource public class StreamPipeSource : IPipeSource
{ {
public System.IO.Stream Source { get; } public Stream Source { get; }
public int BlockSize { get; } = 4096; public int BlockSize { get; } = 4096;
public string StreamFormat { get; } = string.Empty; public string StreamFormat { get; } = string.Empty;
public StreamPipeSource(System.IO.Stream source) public StreamPipeSource(Stream source)
{ {
Source = source; Source = source;
} }
public string GetStreamArguments() => StreamFormat; 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);
} }
} }