.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [windows-latest, ubuntu-latest, macos-13]
     timeout-minutes: 7
     steps:
 
@@ -30,15 +30,14 @@ jobs:
       with:
         dotnet-version: '8.0.x'
 
-    - if: matrix.os == 'ubuntu-latest'
-      name: Lint with dotnet
+    - name: Lint with dotnet
       run: dotnet format FFMpegCore.sln --severity warn --verify-no-changes
 
-    - name: Setup FFmpeg
-      uses: AnimMouse/setup-ffmpeg@ae28d57dabbb148eff63170b6bf7f2b60062cbae # 1.1.0
+    - name: Prepare FFMpeg
+      uses: FedericoCarboni/setup-ffmpeg@v3
       with:
-        version: ${{ matrix.os != 'macos-latest' && '7.1' || '711' }}
-        token: ${{ github.token }}
+        ffmpeg-version: 6.0.1
+        github-token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Test with dotnet
       run: dotnet test FFMpegCore.sln  --collect "XPlat Code Coverage" --logger GitHubActions

FFMpegCore.Examples/Program.cs

@@ -61,7 +61,7 @@ var outputStream = new MemoryStream();
 }
 
 {
-    FFMpeg.JoinImageSequence(@"..\joined_video.mp4", 1, @"..\1.png", @"..\2.png", @"..\3.png");
+    FFMpeg.JoinImageSequence(@"..\joined_video.mp4", frameRate: 1, @"..\1.png", @"..\2.png", @"..\3.png");
 }
 
 {
@@ -90,11 +90,7 @@ var inputImagePath = "/path/to/input/image";
     skiaSharpImage.AddAudio(inputAudioPath, outputPath);
 }
 
-IVideoFrame GetNextFrame()
-{
-    throw new NotImplementedException();
-}
-
+IVideoFrame GetNextFrame() => throw new NotImplementedException();
 {
     IEnumerable<IVideoFrame> CreateFrames(int count)
     {
@@ -104,8 +100,7 @@ IVideoFrame GetNextFrame()
         }
     }
 
-    var videoFramesSource =
-        new RawVideoPipeSource(CreateFrames(64)) //pass IEnumerable<IVideoFrame> or IEnumerator<IVideoFrame> to constructor of RawVideoPipeSource
+    var videoFramesSource = new RawVideoPipeSource(CreateFrames(64)) //pass IEnumerable<IVideoFrame> or IEnumerator<IVideoFrame> to constructor of RawVideoPipeSource
     {
         FrameRate = 30 //set source frame rate
     };

FFMpegCore.Extensions.SkiaSharp/BitmapExtensions.cs

@@ -1,7 +1,7 @@
 using SkiaSharp;
 
-namespace FFMpegCore.Extensions.SkiaSharp;
-
+namespace FFMpegCore.Extensions.SkiaSharp
+{
     public static class BitmapExtensions
     {
         public static bool AddAudio(this SKBitmap poster, string audio, string output)
@@ -25,3 +25,4 @@ public static class BitmapExtensions
             }
         }
     }
+}

FFMpegCore.Extensions.SkiaSharp/BitmapVideoFrameWrapper.cs

@@ -1,29 +1,24 @@
 using FFMpegCore.Pipes;
 using SkiaSharp;
 
-namespace FFMpegCore.Extensions.SkiaSharp;
-
+namespace FFMpegCore.Extensions.SkiaSharp
+{
     public class BitmapVideoFrameWrapper : IVideoFrame, IDisposable
     {
+        public int Width => Source.Width;
+
+        public int Height => Source.Height;
+
+        public string Format { get; private set; }
+
+        public SKBitmap Source { get; private set; }
+
         public BitmapVideoFrameWrapper(SKBitmap bitmap)
         {
             Source = bitmap ?? throw new ArgumentNullException(nameof(bitmap));
             Format = ConvertStreamFormat(bitmap.ColorType);
         }
 
-    public SKBitmap Source { get; }
-
-    public void Dispose()
-    {
-        Source.Dispose();
-    }
-
-    public int Width => Source.Width;
-
-    public int Height => Source.Height;
-
-    public string Format { get; }
-
         public void Serialize(Stream stream)
         {
             var data = Source.Bytes;
@@ -36,6 +31,11 @@ public class BitmapVideoFrameWrapper : IVideoFrame, IDisposable
             await stream.WriteAsync(data, 0, data.Length, token).ConfigureAwait(false);
         }
 
+        public void Dispose()
+        {
+            Source.Dispose();
+        }
+
         private static string ConvertStreamFormat(SKColorType fmt)
         {
             // TODO: Add support for additional formats
@@ -56,3 +56,4 @@ public class BitmapVideoFrameWrapper : IVideoFrame, IDisposable
             }
         }
     }
+}

FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <IsPackable>true</IsPackable>
         <Description>Image extension for FFMpegCore using SkiaSharp</Description>
-    <PackageVersion>5.0.3</PackageVersion>
+        <PackageVersion>5.0.2</PackageVersion>
         <PackageOutputPath>../nupkg</PackageOutputPath>
         <PackageReleaseNotes>Bump dependencies</PackageReleaseNotes>
         <PackageTags>ffmpeg ffprobe convert video audio mediafile resize analyze muxing skiasharp</PackageTags>
@@ -12,8 +12,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="3.119.1"/>
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.1"/>
+      <PackageReference Include="SkiaSharp" Version="3.116.1" />
+      <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.116.1" />
     </ItemGroup>
 
     <ItemGroup>

FFMpegCore.Extensions.SkiaSharp/FFMpegImage.cs

@@ -2,8 +2,8 @@
 using FFMpegCore.Pipes;
 using SkiaSharp;
 
-namespace FFMpegCore.Extensions.SkiaSharp;
-
+namespace FFMpegCore.Extensions.SkiaSharp
+{
     public static class FFMpegImage
     {
         /// <summary>
@@ -30,7 +30,6 @@ public static class FFMpegImage
             using var bitmap = SKBitmap.Decode(ms);
             return bitmap.Copy();
         }
-
         /// <summary>
         ///     Saves a 'png' thumbnail to an in-memory bitmap
         /// </summary>
@@ -40,8 +39,7 @@ public static class FFMpegImage
         /// <param name="streamIndex">Selected video stream index.</param>
         /// <param name="inputFileIndex">Input file index</param>
         /// <returns>Bitmap with the requested snapshot.</returns>
-    public static async Task<SKBitmap> SnapshotAsync(string input, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null,
-        int inputFileIndex = 0)
+        public static async Task<SKBitmap> SnapshotAsync(string input, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
         {
             var source = await FFProbe.AnalyseAsync(input).ConfigureAwait(false);
             var (arguments, outputOptions) = SnapshotArgumentBuilder.BuildSnapshotArguments(input, source, size, captureTime, streamIndex, inputFileIndex);
@@ -56,3 +54,4 @@ public static class FFMpegImage
             return SKBitmap.Decode(ms);
         }
     }
+}

FFMpegCore.Extensions.System.Drawing.Common/BitmapExtensions.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 
-namespace FFMpegCore.Extensions.System.Drawing.Common;
-
+namespace FFMpegCore.Extensions.System.Drawing.Common
+{
     public static class BitmapExtensions
     {
         public static bool AddAudio(this Image poster, string audio, string output)
@@ -21,3 +21,4 @@ public static class BitmapExtensions
             }
         }
     }
+}

FFMpegCore.Extensions.System.Drawing.Common/BitmapVideoFrameWrapper.cs

@@ -3,29 +3,24 @@ using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 using FFMpegCore.Pipes;
 
-namespace FFMpegCore.Extensions.System.Drawing.Common;
-
+namespace FFMpegCore.Extensions.System.Drawing.Common
+{
     public class BitmapVideoFrameWrapper : IVideoFrame, IDisposable
     {
+        public int Width => Source.Width;
+
+        public int Height => Source.Height;
+
+        public string Format { get; private set; }
+
+        public Bitmap Source { get; private set; }
+
         public BitmapVideoFrameWrapper(Bitmap bitmap)
         {
             Source = bitmap ?? throw new ArgumentNullException(nameof(bitmap));
             Format = ConvertStreamFormat(bitmap.PixelFormat);
         }
 
-    public Bitmap Source { get; }
-
-    public void Dispose()
-    {
-        Source.Dispose();
-    }
-
-    public int Width => Source.Width;
-
-    public int Height => Source.Height;
-
-    public string Format { get; }
-
         public void Serialize(Stream stream)
         {
             var data = Source.LockBits(new Rectangle(0, 0, Width, Height), ImageLockMode.ReadOnly, Source.PixelFormat);
@@ -58,6 +53,11 @@ public class BitmapVideoFrameWrapper : IVideoFrame, IDisposable
             }
         }
 
+        public void Dispose()
+        {
+            Source.Dispose();
+        }
+
         private static string ConvertStreamFormat(PixelFormat fmt)
         {
             switch (fmt)
@@ -84,3 +84,4 @@ public class BitmapVideoFrameWrapper : IVideoFrame, IDisposable
             }
         }
     }
+}

FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <Description>Image extension for FFMpegCore using System.Common.Drawing</Description>
-    <PackageVersion>5.0.3</PackageVersion>
+    <PackageVersion>5.0.2</PackageVersion>
     <PackageOutputPath>../nupkg</PackageOutputPath>
     <PackageReleaseNotes>Bump dependencies</PackageReleaseNotes>
     <PackageTags>ffmpeg ffprobe convert video audio mediafile resize analyze muxing</PackageTags>
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="9.0.10"/>
+    <PackageReference Include="System.Drawing.Common" Version="9.0.2" />
   </ItemGroup>
 
   <ItemGroup>

FFMpegCore.Extensions.System.Drawing.Common/FFMpegImage.cs

@@ -1,8 +1,8 @@
 using System.Drawing;
 using FFMpegCore.Pipes;
 
-namespace FFMpegCore.Extensions.System.Drawing.Common;
-
+namespace FFMpegCore.Extensions.System.Drawing.Common
+{
     public static class FFMpegImage
     {
         /// <summary>
@@ -39,8 +39,7 @@ public static class FFMpegImage
         /// <param name="streamIndex">Selected video stream index.</param>
         /// <param name="inputFileIndex">Input file index</param>
         /// <returns>Bitmap with the requested snapshot.</returns>
-    public static async Task<Bitmap> SnapshotAsync(string input, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null,
-        int inputFileIndex = 0)
+        public static async Task<Bitmap> SnapshotAsync(string input, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
         {
             var source = await FFProbe.AnalyseAsync(input).ConfigureAwait(false);
             var (arguments, outputOptions) = SnapshotArgumentBuilder.BuildSnapshotArguments(input, source, size, captureTime, streamIndex, inputFileIndex);
@@ -55,3 +54,4 @@ public static class FFMpegImage
             return new Bitmap(ms);
         }
     }
+}

FFMpegCore.Test/ArgumentBuilderTest.cs

@@ -1,9 +1,10 @@
 using System.Drawing;
 using FFMpegCore.Arguments;
 using FFMpegCore.Enums;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace FFMpegCore.Test;
-
+namespace FFMpegCore.Test
+{
     [TestClass]
     public class ArgumentBuilderTest
     {
@@ -255,16 +256,14 @@ public class ArgumentBuilderTest
         [TestMethod]
         public void Builder_BuildString_Seek()
         {
-        var str = FFMpegArguments.FromFileInput("input.mp4", false, opt => opt.Seek(TimeSpan.FromSeconds(10)))
-            .OutputToFile("output.mp4", false, opt => opt.Seek(TimeSpan.FromSeconds(10))).Arguments;
+            var str = FFMpegArguments.FromFileInput("input.mp4", false, opt => opt.Seek(TimeSpan.FromSeconds(10))).OutputToFile("output.mp4", false, opt => opt.Seek(TimeSpan.FromSeconds(10))).Arguments;
             Assert.AreEqual("-ss 00:00:10.000 -i \"input.mp4\" -ss 00:00:10.000 \"output.mp4\"", str);
         }
 
         [TestMethod]
         public void Builder_BuildString_EndSeek()
         {
-        var str = FFMpegArguments.FromFileInput("input.mp4", false, opt => opt.EndSeek(TimeSpan.FromSeconds(10)))
-            .OutputToFile("output.mp4", false, opt => opt.EndSeek(TimeSpan.FromSeconds(10))).Arguments;
+            var str = FFMpegArguments.FromFileInput("input.mp4", false, opt => opt.EndSeek(TimeSpan.FromSeconds(10))).OutputToFile("output.mp4", false, opt => opt.EndSeek(TimeSpan.FromSeconds(10))).Arguments;
             Assert.AreEqual("-to 00:00:10.000 -i \"input.mp4\" -to 00:00:10.000 \"output.mp4\"", str);
         }
 
@@ -339,7 +338,7 @@ public class ArgumentBuilderTest
                 .OutputToFile("output.mp4", false, opt => opt
                     .WithVideoFilters(filterOptions => filterOptions
                         .HardBurnSubtitle(SubtitleHardBurnOptions
-                        .Create("sample.srt")
+                            .Create(subtitlePath: "sample.srt")
                             .SetCharacterEncoding("UTF-8")
                             .SetOriginalSize(1366, 768)
                             .SetSubtitleIndex(0)
@@ -348,8 +347,7 @@ public class ArgumentBuilderTest
                                 .WithParameter("PrimaryColour", "&HAA00FF00")))))
                 .Arguments;
 
-        Assert.AreEqual(
-            "-i \"input.mp4\" -vf \"subtitles='sample.srt':charenc=UTF-8:original_size=1366x768:stream_index=0:force_style='FontName=DejaVu Serif\\,PrimaryColour=&HAA00FF00'\" \"output.mp4\"",
+            Assert.AreEqual("-i \"input.mp4\" -vf \"subtitles='sample.srt':charenc=UTF-8:original_size=1366x768:stream_index=0:force_style='FontName=DejaVu Serif\\,PrimaryColour=&HAA00FF00'\" \"output.mp4\"",
                 str);
         }
 
@@ -361,7 +359,7 @@ public class ArgumentBuilderTest
                 .OutputToFile("output.mp4", false, opt => opt
                     .WithVideoFilters(filterOptions => filterOptions
                         .HardBurnSubtitle(SubtitleHardBurnOptions
-                        .Create(@"sample( \ : [ ] , ' ).srt"))))
+                            .Create(subtitlePath: @"sample( \ : [ ] , ' ).srt"))))
                 .Arguments;
 
             Assert.AreEqual(@"-i ""input.mp4"" -vf ""subtitles='sample( \\ \: \[ \] \, '\\\'' ).srt'"" ""output.mp4""",
@@ -496,7 +494,7 @@ public class ArgumentBuilderTest
         {
             var str = FFMpegArguments.FromFileInput("input.aaxc", false, x => x.WithAudibleEncryptionKeys("123", "456"))
                 .MapMetaData()
-            .OutputToFile("output.m4b", true, x => x.WithTagVersion().DisableChannel(Channel.Video).CopyChannel(Channel.Audio))
+                .OutputToFile("output.m4b", true, x => x.WithTagVersion(3).DisableChannel(Channel.Video).CopyChannel(Channel.Audio))
                 .Arguments;
 
             Assert.AreEqual("-audible_key 123 -audible_iv 456 -i \"input.aaxc\" -map_metadata 0 -id3v2_version 3 -vn -c:a copy \"output.m4b\" -y", str);
@@ -580,11 +578,13 @@ public class ArgumentBuilderTest
         {
             var str = FFMpegArguments.FromFileInput("input.mp4")
                 .MultiOutput(args => args
-                .OutputToFile("output.mp4", true, args => args.CopyChannel())
-                .OutputToFile("output.ts", false, args => args.CopyChannel().ForceFormat("mpegts"))
+                    .OutputToFile("output.mp4", overwrite: true, args => args.CopyChannel())
+                    .OutputToFile("output.ts", overwrite: false, args => args.CopyChannel().ForceFormat("mpegts"))
                     .OutputToUrl("http://server/path", options => options.ForceFormat("webm")))
                     .Arguments;
-        Assert.AreEqual("""-i "input.mp4" -c:a copy -c:v copy "output.mp4" -y -c:a copy -c:v copy -f mpegts "output.ts" -f webm http://server/path""", str);
+            Assert.AreEqual($"""
+                -i "input.mp4" -c:a copy -c:v copy "output.mp4" -y -c:a copy -c:v copy -f mpegts "output.ts" -f webm http://server/path
+                """, str);
         }
 
         [TestMethod]
@@ -592,10 +592,10 @@ public class ArgumentBuilderTest
         {
             var str = FFMpegArguments.FromFileInput("input.mp4")
                 .MultiOutput(args => args
-                .OutputToFile("sd.mp4", true, args => args.Resize(1200, 720))
-                .OutputToFile("hd.mp4", false, args => args.Resize(1920, 1080)))
+                    .OutputToFile("sd.mp4", overwrite: true, args => args.Resize(1200, 720))
+                    .OutputToFile("hd.mp4", overwrite: false, args => args.Resize(1920, 1080)))
                     .Arguments;
-        Assert.AreEqual("""
+            Assert.AreEqual($"""
                 -i "input.mp4" -s 1200x720 "sd.mp4" -y -s 1920x1080 "hd.mp4"
                 """, str);
         }
@@ -605,14 +605,13 @@ public class ArgumentBuilderTest
         {
             var str = FFMpegArguments.FromFileInput("input.mp4")
                 .OutputToTee(args => args
-                .OutputToFile("output.mp4", false, args => args.WithFastStart())
+                    .OutputToFile("output.mp4", overwrite: false, args => args.WithFastStart())
                     .OutputToUrl("http://server/path", options => options.ForceFormat("mpegts").SelectStream(0, channel: Channel.Video)))
                     .Arguments;
-        Assert.AreEqual("""
+            Assert.AreEqual($"""
                 -i "input.mp4" -f tee "[movflags=faststart]output.mp4|[f=mpegts:select=\'0:v:0\']http://server/path"
                 """, str);
         }
-
         [TestMethod]
         public void Builder_BuildString_MultiInput()
         {
@@ -621,24 +620,26 @@ public class ArgumentBuilderTest
             var ffmpegArgs = $"-filter_complex \"{mixFilter}\" -map \"[final]\"";
             var str = FFMpegArguments
                 .FromFileInput(_multiFiles)
-            .OutputToFile("output.mp3", true, options => options
+                .OutputToFile("output.mp3", overwrite: true, options => options
                     .WithCustomArgument(ffmpegArgs)
                     .WithAudioCodec(AudioCodec.LibMp3Lame) // Set the audio codec to MP3
                     .WithAudioBitrate(128) // Set the bitrate to 128kbps
-                .WithAudioSamplingRate() // Set the sample rate to 48kHz
+                    .WithAudioSamplingRate(48000) // Set the sample rate to 48kHz
                     .WithoutMetadata() // Remove metadata
                     .WithCustomArgument("-ac 2 -write_xing 0 -id3v2_version 0")) // Force 2 Channels
                 .Arguments;
-        Assert.AreEqual(
-            "-i \"1.mp3\" -i \"2.mp3\" -i \"3.mp3\" -i \"4.mp3\" -filter_complex \"[0:0][1:0][2:0][3:0]amix=inputs=4:duration=longest:dropout_transition=1:normalize=0[final]\" -map \"[final]\" -c:a libmp3lame -b:a 128k -ar 48000 -map_metadata -1 -ac 2 -write_xing 0 -id3v2_version 0 \"output.mp3\" -y",
-            str);
+            Assert.AreEqual($"-i \"1.mp3\" -i \"2.mp3\" -i \"3.mp3\" -i \"4.mp3\" -filter_complex \"[0:0][1:0][2:0][3:0]amix=inputs=4:duration=longest:dropout_transition=1:normalize=0[final]\" -map \"[final]\" -c:a libmp3lame -b:a 128k -ar 48000 -map_metadata -1 -ac 2 -write_xing 0 -id3v2_version 0 \"output.mp3\" -y", str);
         }
-
         [TestMethod]
         public void Pre_VerifyExists_AllFilesExist()
         {
             // Arrange
-        var filePaths = new List<string> { Path.GetTempFileName(), Path.GetTempFileName(), Path.GetTempFileName() };
+            var filePaths = new List<string>
+            {
+                Path.GetTempFileName(),
+                Path.GetTempFileName(),
+                Path.GetTempFileName()
+            };
             var argument = new MultiInputArgument(true, filePaths);
             try
             {
@@ -659,12 +660,17 @@ public class ArgumentBuilderTest
         public void Pre_VerifyExists_SomeFilesNotExist()
         {
             // Arrange
-        var filePaths = new List<string> { Path.GetTempFileName(), "file2.mp4", "file3.mp4" };
+            var filePaths = new List<string>
+            {
+                Path.GetTempFileName(),
+                "file2.mp4",
+                "file3.mp4"
+            };
             var argument = new MultiInputArgument(true, filePaths);
             try
             {
                 // Act & Assert
-            Assert.ThrowsExactly<FileNotFoundException>(() => argument.Pre());
+                Assert.ThrowsException<FileNotFoundException>(() => argument.Pre());
             }
             finally
             {
@@ -677,9 +683,15 @@ public class ArgumentBuilderTest
         public void Pre_VerifyExists_NoFilesExist()
         {
             // Arrange
-        var filePaths = new List<string> { "file1.mp4", "file2.mp4", "file3.mp4" };
+            var filePaths = new List<string>
+            {
+                "file1.mp4",
+                "file2.mp4",
+                "file3.mp4"
+            };
             var argument = new MultiInputArgument(true, filePaths);
             // Act & Assert
-        Assert.ThrowsExactly<FileNotFoundException>(() => argument.Pre());
+            Assert.ThrowsException<FileNotFoundException>(() => argument.Pre());
+        }
     }
 }

FFMpegCore.Test/Assembly.cs

@@ -1 +0,0 @@
-[assembly: Parallelize]

FFMpegCore.Test/AudioTest.cs

@@ -3,9 +3,10 @@ using FFMpegCore.Exceptions;
 using FFMpegCore.Extend;
 using FFMpegCore.Pipes;
 using FFMpegCore.Test.Resources;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace FFMpegCore.Test;
-
+namespace FFMpegCore.Test
+{
     [TestClass]
     public class AudioTest
     {
@@ -17,8 +18,8 @@ public class AudioTest
             FFMpeg.Mute(TestResources.Mp4Video, outputFile);
             var analysis = FFProbe.Analyse(outputFile);
 
-        Assert.IsNotEmpty(analysis.VideoStreams);
-        Assert.IsEmpty(analysis.AudioStreams);
+            Assert.IsTrue(analysis.VideoStreams.Any());
+            Assert.IsTrue(!analysis.AudioStreams.Any());
         }
 
         [TestMethod]
@@ -29,10 +30,9 @@ public class AudioTest
             FFMpeg.ExtractAudio(TestResources.Mp4Video, outputFile);
             var analysis = FFProbe.Analyse(outputFile);
 
-        Assert.IsNotEmpty(analysis.AudioStreams);
-        Assert.IsEmpty(analysis.VideoStreams);
+            Assert.IsTrue(!analysis.VideoStreams.Any());
+            Assert.IsTrue(analysis.AudioStreams.Any());
         }
-
         [TestMethod]
         public async Task Audio_FromRaw()
         {
@@ -65,19 +65,27 @@ public class AudioTest
             using var outputFile = new TemporaryFile("out.mp4");
             FFMpeg.PosterWithAudio(TestResources.PngImage, TestResources.Mp3Audio, outputFile);
             var analysis = FFProbe.Analyse(TestResources.Mp3Audio);
-        Assert.IsGreaterThan(0, analysis.Duration.TotalSeconds);
+            Assert.IsTrue(analysis.Duration.TotalSeconds > 0);
             Assert.IsTrue(File.Exists(outputFile));
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_ToAAC_Args_Pipe()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        var samples = new List<IAudioSample> { new PcmAudioSampleWrapper([0, 0]), new PcmAudioSampleWrapper([0, 0]) };
+            var samples = new List<IAudioSample>
+            {
+                new PcmAudioSampleWrapper(new byte[] { 0, 0 }),
+                new PcmAudioSampleWrapper(new byte[] { 0, 0 }),
+            };
 
-        var audioSamplesSource = new RawAudioPipeSource(samples) { Channels = 2, Format = "s8", SampleRate = 8000 };
+            var audioSamplesSource = new RawAudioPipeSource(samples)
+            {
+                Channels = 2,
+                Format = "s8",
+                SampleRate = 8000,
+            };
 
             var success = FFMpegArguments
                 .FromPipeInput(audioSamplesSource)
@@ -87,15 +95,23 @@ public class AudioTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_ToLibVorbis_Args_Pipe()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        var samples = new List<IAudioSample> { new PcmAudioSampleWrapper([0, 0]), new PcmAudioSampleWrapper([0, 0]) };
+            var samples = new List<IAudioSample>
+            {
+                new PcmAudioSampleWrapper(new byte[] { 0, 0 }),
+                new PcmAudioSampleWrapper(new byte[] { 0, 0 }),
+            };
 
-        var audioSamplesSource = new RawAudioPipeSource(samples) { Channels = 2, Format = "s8", SampleRate = 8000 };
+            var audioSamplesSource = new RawAudioPipeSource(samples)
+            {
+                Channels = 2,
+                Format = "s8",
+                SampleRate = 8000,
+            };
 
             var success = FFMpegArguments
                 .FromPipeInput(audioSamplesSource)
@@ -105,15 +121,23 @@ public class AudioTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Audio_ToAAC_Args_Pipe_Async()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        var samples = new List<IAudioSample> { new PcmAudioSampleWrapper([0, 0]), new PcmAudioSampleWrapper([0, 0]) };
+            var samples = new List<IAudioSample>
+            {
+                new PcmAudioSampleWrapper(new byte[] { 0, 0 }),
+                new PcmAudioSampleWrapper(new byte[] { 0, 0 }),
+            };
 
-        var audioSamplesSource = new RawAudioPipeSource(samples) { Channels = 2, Format = "s8", SampleRate = 8000 };
+            var audioSamplesSource = new RawAudioPipeSource(samples)
+            {
+                Channels = 2,
+                Format = "s8",
+                SampleRate = 8000,
+            };
 
             var success = await FFMpegArguments
                 .FromPipeInput(audioSamplesSource)
@@ -123,13 +147,16 @@ public class AudioTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_ToAAC_Args_Pipe_ValidDefaultConfiguration()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        var samples = new List<IAudioSample> { new PcmAudioSampleWrapper([0, 0]), new PcmAudioSampleWrapper([0, 0]) };
+            var samples = new List<IAudioSample>
+            {
+                new PcmAudioSampleWrapper(new byte[] { 0, 0 }),
+                new PcmAudioSampleWrapper(new byte[] { 0, 0 }),
+            };
 
             var audioSamplesSource = new RawAudioPipeSource(samples);
 
@@ -141,53 +168,58 @@ public class AudioTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_ToAAC_Args_Pipe_InvalidChannels()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        var audioSamplesSource = new RawAudioPipeSource(new List<IAudioSample>()) { Channels = 0 };
+            var audioSamplesSource = new RawAudioPipeSource(new List<IAudioSample>())
+            {
+                Channels = 0,
+            };
 
-        Assert.ThrowsExactly<FFMpegException>(() => FFMpegArguments
+            var ex = Assert.ThrowsException<FFMpegException>(() => FFMpegArguments
                 .FromPipeInput(audioSamplesSource)
                 .OutputToFile(outputFile, false, opt => opt
                     .WithAudioCodec(AudioCodec.Aac))
                 .ProcessSynchronously());
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_ToAAC_Args_Pipe_InvalidFormat()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        var audioSamplesSource = new RawAudioPipeSource(new List<IAudioSample>()) { Format = "s8le" };
+            var audioSamplesSource = new RawAudioPipeSource(new List<IAudioSample>())
+            {
+                Format = "s8le",
+            };
 
-        Assert.ThrowsExactly<FFMpegException>(() => FFMpegArguments
+            var ex = Assert.ThrowsException<FFMpegException>(() => FFMpegArguments
                 .FromPipeInput(audioSamplesSource)
                 .OutputToFile(outputFile, false, opt => opt
                     .WithAudioCodec(AudioCodec.Aac))
                 .ProcessSynchronously());
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_ToAAC_Args_Pipe_InvalidSampleRate()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        var audioSamplesSource = new RawAudioPipeSource(new List<IAudioSample>()) { SampleRate = 0 };
+            var audioSamplesSource = new RawAudioPipeSource(new List<IAudioSample>())
+            {
+                SampleRate = 0,
+            };
 
-        Assert.ThrowsExactly<FFMpegException>(() => FFMpegArguments
+            var ex = Assert.ThrowsException<FFMpegException>(() => FFMpegArguments
                 .FromPipeInput(audioSamplesSource)
                 .OutputToFile(outputFile, false, opt => opt
                     .WithAudioCodec(AudioCodec.Aac))
                 .ProcessSynchronously());
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_Pan_ToMono()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
@@ -201,12 +233,11 @@ public class AudioTest
             var mediaAnalysis = FFProbe.Analyse(outputFile);
 
             Assert.IsTrue(success);
-        Assert.HasCount(1, mediaAnalysis.AudioStreams);
+            Assert.AreEqual(1, mediaAnalysis.AudioStreams.Count);
             Assert.AreEqual("mono", mediaAnalysis.PrimaryAudioStream!.ChannelLayout);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_Pan_ToMonoNoDefinitions()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
@@ -220,38 +251,35 @@ public class AudioTest
             var mediaAnalysis = FFProbe.Analyse(outputFile);
 
             Assert.IsTrue(success);
-        Assert.HasCount(1, mediaAnalysis.AudioStreams);
+            Assert.AreEqual(1, mediaAnalysis.AudioStreams.Count);
             Assert.AreEqual("mono", mediaAnalysis.PrimaryAudioStream!.ChannelLayout);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_Pan_ToMonoChannelsToOutputDefinitionsMismatch()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        Assert.ThrowsExactly<ArgumentException>(() => FFMpegArguments.FromFileInput(TestResources.Mp3Audio)
+            var ex = Assert.ThrowsException<ArgumentException>(() => FFMpegArguments.FromFileInput(TestResources.Mp3Audio)
                 .OutputToFile(outputFile, true,
                     argumentOptions => argumentOptions
                         .WithAudioFilters(filter => filter.Pan(1, "c0=c0", "c1=c1")))
                 .ProcessSynchronously());
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_Pan_ToMonoChannelsLayoutToOutputDefinitionsMismatch()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        Assert.ThrowsExactly<FFMpegException>(() => FFMpegArguments.FromFileInput(TestResources.Mp3Audio)
+            var ex = Assert.ThrowsException<FFMpegException>(() => FFMpegArguments.FromFileInput(TestResources.Mp3Audio)
                 .OutputToFile(outputFile, true,
                     argumentOptions => argumentOptions
                         .WithAudioFilters(filter => filter.Pan("mono", "c0=c0", "c1=c1")))
                 .ProcessSynchronously());
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_DynamicNormalizer_WithDefaultValues()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
@@ -265,8 +293,7 @@ public class AudioTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Audio_DynamicNormalizer_WithNonDefaultValues()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
@@ -274,14 +301,14 @@ public class AudioTest
             var success = FFMpegArguments.FromFileInput(TestResources.Mp3Audio)
                 .OutputToFile(outputFile, true,
                     argumentOptions => argumentOptions
-                    .WithAudioFilters(filter => filter.DynamicNormalizer(250, 7, 0.9, 2, 1, false, true, true, 0.5)))
+                        .WithAudioFilters(
+                            filter => filter.DynamicNormalizer(250, 7, 0.9, 2, 1, false, true, true, 0.5)))
                 .ProcessSynchronously();
 
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [DataTestMethod, Timeout(10000)]
         [DataRow(2)]
         [DataRow(32)]
         [DataRow(8)]
@@ -289,11 +316,13 @@ public class AudioTest
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
 
-        Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => FFMpegArguments
+            var ex = Assert.ThrowsException<ArgumentOutOfRangeException>(() => FFMpegArguments
                 .FromFileInput(TestResources.Mp3Audio)
                 .OutputToFile(outputFile, true,
                     argumentOptions => argumentOptions
-                    .WithAudioFilters(filter => filter.DynamicNormalizer(filterWindow: filterWindow)))
+                        .WithAudioFilters(
+                            filter => filter.DynamicNormalizer(filterWindow: filterWindow)))
                 .ProcessSynchronously());
         }
     }
+}

FFMpegCore.Test/FFMpegArgumentProcessorTest.cs

@@ -1,35 +1,34 @@
-using FFMpegCore.Arguments;
-
-namespace FFMpegCore.Test;
+using System.Reflection;
+using FFMpegCore.Arguments;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+namespace FFMpegCore.Test
+{
     [TestClass]
     public class FFMpegArgumentProcessorTest
     {
-    private static FFMpegArgumentProcessor CreateArgumentProcessor()
+        [TestCleanup]
+        public void TestInitialize()
+
         {
-        return FFMpegArguments
+            // After testing reset global configuration to null, to be not wrong for other test relying on configuration
+            typeof(GlobalFFOptions).GetField("_current", BindingFlags.NonPublic | BindingFlags.Static)!.SetValue(GlobalFFOptions.Current, null);
+        }
+
+        private static FFMpegArgumentProcessor CreateArgumentProcessor() => FFMpegArguments
                         .FromFileInput("")
                         .OutputToFile("");
-    }
 
         [TestMethod]
         public void Processor_GlobalOptions_GetUsed()
         {
-        var globalWorkingDir = "Whatever1";
-        var processor = CreateArgumentProcessor();
-
-        try
-        {
+            var globalWorkingDir = "Whatever";
             GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir });
 
-            var options = processor.GetConfiguredOptions(null);
-
-            Assert.AreEqual(globalWorkingDir, options.WorkingDirectory);
-        }
-        finally
-        {
-            GlobalFFOptions.Configure(new FFOptions());
-        }
+            var processor = CreateArgumentProcessor();
+            var options2 = processor.GetConfiguredOptions(null);
+            options2.WorkingDirectory.Should().Be(globalWorkingDir);
         }
 
         [TestMethod]
@@ -41,81 +40,64 @@ public class FFMpegArgumentProcessorTest
             processor.Configure(options => options.WorkingDirectory = sessionWorkingDir);
             var options = processor.GetConfiguredOptions(null);
 
-        Assert.AreEqual(sessionWorkingDir, options.WorkingDirectory);
+            options.WorkingDirectory.Should().Be(sessionWorkingDir);
         }
 
         [TestMethod]
         public void Processor_Options_CanBeOverridden_And_Configured()
         {
-        var globalConfig = "Whatever2";
+            var globalConfig = "Whatever";
+            GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalConfig, TemporaryFilesFolder = globalConfig, BinaryFolder = globalConfig });
 
-        try
-        {
             var processor = CreateArgumentProcessor();
 
             var sessionTempDir = "./CurrentRunWorkingDir";
             processor.Configure(options => options.TemporaryFilesFolder = sessionTempDir);
 
-            var overrideOptions = new FFOptions { WorkingDirectory = "override" };
+            var overrideOptions = new FFOptions() { WorkingDirectory = "override" };
+            var options = processor.GetConfiguredOptions(overrideOptions);
 
-            GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalConfig, TemporaryFilesFolder = globalConfig, BinaryFolder = globalConfig });
-            var configuredOptions = processor.GetConfiguredOptions(overrideOptions);
-
-            Assert.AreEqual(configuredOptions.WorkingDirectory, overrideOptions.WorkingDirectory);
-            Assert.AreEqual(configuredOptions.TemporaryFilesFolder, overrideOptions.TemporaryFilesFolder);
-            Assert.AreEqual(configuredOptions.BinaryFolder, overrideOptions.BinaryFolder);
-
-            Assert.AreEqual(sessionTempDir, configuredOptions.TemporaryFilesFolder);
-            Assert.AreNotEqual(globalConfig, configuredOptions.BinaryFolder);
-        }
-        finally
-        {
-            GlobalFFOptions.Configure(new FFOptions());
-        }
+            options.Should().BeEquivalentTo(overrideOptions);
+            options.TemporaryFilesFolder.Should().BeEquivalentTo(sessionTempDir);
+            options.BinaryFolder.Should().NotBeEquivalentTo(globalConfig);
         }
 
         [TestMethod]
         public void Options_Global_And_Session_Options_Can_Differ()
         {
-        var globalWorkingDir = "Whatever3";
+            var globalWorkingDir = "Whatever";
+            GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir });
 
-        try
-        {
             var processor1 = CreateArgumentProcessor();
             var sessionWorkingDir = "./CurrentRunWorkingDir";
             processor1.Configure(options => options.WorkingDirectory = sessionWorkingDir);
             var options1 = processor1.GetConfiguredOptions(null);
-            Assert.AreEqual(sessionWorkingDir, options1.WorkingDirectory);
+            options1.WorkingDirectory.Should().Be(sessionWorkingDir);
 
             var processor2 = CreateArgumentProcessor();
-            GlobalFFOptions.Configure(new FFOptions { WorkingDirectory = globalWorkingDir });
             var options2 = processor2.GetConfiguredOptions(null);
-            Assert.AreEqual(globalWorkingDir, options2.WorkingDirectory);
-        }
-        finally
-        {
-            GlobalFFOptions.Configure(new FFOptions());
-        }
+            options2.WorkingDirectory.Should().Be(globalWorkingDir);
         }
 
         [TestMethod]
         public void Concat_Escape()
         {
-        var arg = new DemuxConcatArgument([@"Heaven's River\05 - Investigation.m4b"]);
-        CollectionAssert.AreEquivalent(new[] { @"file 'Heaven'\''s River\05 - Investigation.m4b'" }, arg.Values.ToArray());
+            var arg = new DemuxConcatArgument(new[] { @"Heaven's River\05 - Investigation.m4b" });
+            arg.Values.Should().BeEquivalentTo(new[] { @"file 'Heaven'\''s River\05 - Investigation.m4b'" });
         }
 
         [TestMethod]
         public void Audible_Aaxc_Test()
         {
             var arg = new AudibleEncryptionKeyArgument("123", "456");
-        Assert.AreEqual("-audible_key 123 -audible_iv 456", arg.Text);
+            arg.Text.Should().Be($"-audible_key 123 -audible_iv 456");
         }
 
         [TestMethod]
         public void Audible_Aax_Test()
         {
             var arg = new AudibleEncryptionKeyArgument("62689101");
-        Assert.AreEqual("-activation_bytes 62689101", arg.Text);
+            arg.Text.Should().Be($"-activation_bytes 62689101");
+        }
     }
 }

FFMpegCore.Test/FFMpegCore.Test.csproj

@@ -12,14 +12,15 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="8.0.1" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0"/>
-    <PackageReference Include="MSTest.TestAdapter" Version="4.0.1"/>
-    <PackageReference Include="MSTest.TestFramework" Version="4.0.1"/>
-    <PackageReference Include="SkiaSharp" Version="3.119.1"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.8.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.8.0" />
+    <PackageReference Include="SkiaSharp" Version="3.116.1" />
   </ItemGroup>
 
   <ItemGroup>

FFMpegCore.Test/FFMpegOptionsTests.cs

@@ -1,7 +1,8 @@
-using Newtonsoft.Json;
-
-namespace FFMpegCore.Test;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
 
+namespace FFMpegCore.Test
+{
     [TestClass]
     public class FFMpegOptionsTest
     {
@@ -14,7 +15,7 @@ public class FFMpegOptionsTest
         [TestMethod]
         public void Options_Defaults_Configured()
         {
-        Assert.AreEqual("", new FFOptions().BinaryFolder);
+            Assert.AreEqual(new FFOptions().BinaryFolder, $"");
         }
 
         [TestMethod]
@@ -34,8 +35,8 @@ public class FFMpegOptionsTest
             {
                 GlobalFFOptions.Configure(new FFOptions { BinaryFolder = "Whatever" });
                 Assert.AreEqual(
-                "Whatever",
-                GlobalFFOptions.Current.BinaryFolder
+                    GlobalFFOptions.Current.BinaryFolder,
+                    "Whatever"
                 );
             }
             finally
@@ -44,3 +45,4 @@ public class FFMpegOptionsTest
             }
         }
     }
+}

FFMpegCore.Test/FFProbeTests.cs

@@ -1,18 +1,17 @@
 using FFMpegCore.Test.Resources;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace FFMpegCore.Test;
-
+namespace FFMpegCore.Test
+{
     [TestClass]
     public class FFProbeTests
     {
-    public TestContext TestContext { get; set; }
-
         [TestMethod]
         public async Task Audio_FromStream_Duration()
         {
-        var fileAnalysis = await FFProbe.AnalyseAsync(TestResources.WebmVideo, cancellationToken: TestContext.CancellationToken);
+            var fileAnalysis = await FFProbe.AnalyseAsync(TestResources.WebmVideo);
             await using var inputStream = File.OpenRead(TestResources.WebmVideo);
-        var streamAnalysis = await FFProbe.AnalyseAsync(inputStream, cancellationToken: TestContext.CancellationToken);
+            var streamAnalysis = await FFProbe.AnalyseAsync(inputStream);
             Assert.IsTrue(fileAnalysis.Duration == streamAnalysis.Duration);
         }
 
@@ -21,7 +20,7 @@ public class FFProbeTests
         {
             var frameAnalysis = FFProbe.GetFrames(TestResources.WebmVideo);
 
-        Assert.HasCount(90, frameAnalysis.Frames);
+            Assert.AreEqual(90, frameAnalysis.Frames.Count);
             Assert.IsTrue(frameAnalysis.Frames.All(f => f.PixelFormat == "yuv420p"));
             Assert.IsTrue(frameAnalysis.Frames.All(f => f.Height == 360));
             Assert.IsTrue(frameAnalysis.Frames.All(f => f.Width == 640));
@@ -31,9 +30,9 @@ public class FFProbeTests
         [TestMethod]
         public async Task FrameAnalysis_Async()
         {
-        var frameAnalysis = await FFProbe.GetFramesAsync(TestResources.WebmVideo, cancellationToken: TestContext.CancellationToken);
+            var frameAnalysis = await FFProbe.GetFramesAsync(TestResources.WebmVideo);
 
-        Assert.HasCount(90, frameAnalysis.Frames);
+            Assert.AreEqual(90, frameAnalysis.Frames.Count);
             Assert.IsTrue(frameAnalysis.Frames.All(f => f.PixelFormat == "yuv420p"));
             Assert.IsTrue(frameAnalysis.Frames.All(f => f.Height == 360));
             Assert.IsTrue(frameAnalysis.Frames.All(f => f.Width == 640));
@@ -43,11 +42,11 @@ public class FFProbeTests
         [TestMethod]
         public async Task PacketAnalysis_Async()
         {
-        var packetAnalysis = await FFProbe.GetPacketsAsync(TestResources.WebmVideo, cancellationToken: TestContext.CancellationToken);
+            var packetAnalysis = await FFProbe.GetPacketsAsync(TestResources.WebmVideo);
             var packets = packetAnalysis.Packets;
-        Assert.HasCount(96, packets);
+            Assert.AreEqual(96, packets.Count);
             Assert.IsTrue(packets.All(f => f.CodecType == "video"));
-        Assert.StartsWith("K_", packets[0].Flags);
+            Assert.IsTrue(packets[0].Flags.StartsWith("K_"));
             Assert.AreEqual(1362, packets.Last().Size);
         }
 
@@ -56,9 +55,9 @@ public class FFProbeTests
         {
             var packets = FFProbe.GetPackets(TestResources.WebmVideo).Packets;
 
-        Assert.HasCount(96, packets);
+            Assert.AreEqual(96, packets.Count);
             Assert.IsTrue(packets.All(f => f.CodecType == "video"));
-        Assert.StartsWith("K_", packets[0].Flags);
+            Assert.IsTrue(packets[0].Flags.StartsWith("K_"));
             Assert.AreEqual(1362, packets.Last().Size);
         }
 
@@ -67,7 +66,7 @@ public class FFProbeTests
         {
             var packets = FFProbe.GetPackets(TestResources.Mp4Video).Packets;
 
-        Assert.HasCount(216, packets);
+            Assert.AreEqual(216, packets.Count);
             var actual = packets.Select(f => f.CodecType).Distinct().ToList();
             var expected = new List<string> { "audio", "video" };
             CollectionAssert.AreEquivalent(expected, actual);
@@ -76,13 +75,12 @@ public class FFProbeTests
             Assert.AreEqual(141, packets.Count(t => t.CodecType == "audio"));
         }
 
-    [TestMethod]
+        [DataTestMethod]
         [DataRow("0:00:03.008000", 0, 0, 0, 3, 8)]
         [DataRow("05:12:59.177", 0, 5, 12, 59, 177)]
         [DataRow("149:07:50.911750", 6, 5, 7, 50, 911)]
         [DataRow("00:00:00.83", 0, 0, 0, 0, 830)]
-    public void MediaAnalysis_ParseDuration(string duration, int expectedDays, int expectedHours, int expectedMinutes, int expectedSeconds,
-        int expectedMilliseconds)
+        public void MediaAnalysis_ParseDuration(string duration, int expectedDays, int expectedHours, int expectedMinutes, int expectedSeconds, int expectedMilliseconds)
         {
             var ffprobeStream = new FFProbeStream { Duration = duration };
 
@@ -95,12 +93,10 @@ public class FFProbeTests
             Assert.AreEqual(expectedMilliseconds, parsedDuration.Milliseconds);
         }
 
-    [TestMethod]
-    [Ignore("Consistently fails on GitHub Workflow ubuntu agents")]
+        [TestMethod, Ignore("Consistently fails on GitHub Workflow ubuntu agents")]
         public async Task Uri_Duration()
         {
-        var fileAnalysis = await FFProbe.AnalyseAsync(new Uri("https://github.com/rosenbjerg/FFMpegCore/raw/master/FFMpegCore.Test/Resources/input_3sec.webm"),
-            cancellationToken: TestContext.CancellationToken);
+            var fileAnalysis = await FFProbe.AnalyseAsync(new Uri("https://github.com/rosenbjerg/FFMpegCore/raw/master/FFMpegCore.Test/Resources/input_3sec.webm"));
             Assert.IsNotNull(fileAnalysis);
         }
 
@@ -109,7 +105,7 @@ public class FFProbeTests
         {
             var info = FFProbe.Analyse(TestResources.Mp4Video);
             Assert.AreEqual(3, info.Duration.Seconds);
-        Assert.IsEmpty(info.Chapters);
+            Assert.AreEqual(0, info.Chapters.Count);
 
             Assert.AreEqual("5.1", info.PrimaryAudioStream!.ChannelLayout);
             Assert.AreEqual(6, info.PrimaryAudioStream.Channels);
@@ -144,11 +140,9 @@ public class FFProbeTests
         public void Probe_Rotation()
         {
             var info = FFProbe.Analyse(TestResources.Mp4Video);
-        Assert.IsNotNull(info.PrimaryVideoStream);
             Assert.AreEqual(0, info.PrimaryVideoStream.Rotation);
 
             info = FFProbe.Analyse(TestResources.Mp4VideoRotation);
-        Assert.IsNotNull(info.PrimaryVideoStream);
             Assert.AreEqual(90, info.PrimaryVideoStream.Rotation);
         }
 
@@ -156,25 +150,20 @@ public class FFProbeTests
         public void Probe_Rotation_Negative_Value()
         {
             var info = FFProbe.Analyse(TestResources.Mp4VideoRotationNegative);
-        Assert.IsNotNull(info.PrimaryVideoStream);
             Assert.AreEqual(-90, info.PrimaryVideoStream.Rotation);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Async_Success()
         {
-        var info = await FFProbe.AnalyseAsync(TestResources.Mp4Video, cancellationToken: TestContext.CancellationToken);
+            var info = await FFProbe.AnalyseAsync(TestResources.Mp4Video);
             Assert.AreEqual(3, info.Duration.Seconds);
-        Assert.IsNotNull(info.PrimaryVideoStream);
             Assert.AreEqual(8, info.PrimaryVideoStream.BitDepth);
             // This video's audio stream is AAC, which is lossy, so bit depth is meaningless.
-        Assert.IsNotNull(info.PrimaryAudioStream);
             Assert.IsNull(info.PrimaryAudioStream.BitDepth);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Probe_Success_FromStream()
         {
             using var stream = File.OpenRead(TestResources.WebmVideo);
@@ -184,17 +173,15 @@ public class FFProbeTests
             Assert.IsNull(info.PrimaryAudioStream);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Success_FromStream_Async()
         {
             await using var stream = File.OpenRead(TestResources.WebmVideo);
-        var info = await FFProbe.AnalyseAsync(stream, cancellationToken: TestContext.CancellationToken);
+            var info = await FFProbe.AnalyseAsync(stream);
             Assert.AreEqual(3, info.Duration.Seconds);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public void Probe_HDR()
         {
             var info = FFProbe.Analyse(TestResources.HdrVideo);
@@ -206,75 +193,66 @@ public class FFProbeTests
             Assert.AreEqual("bt2020", info.PrimaryVideoStream.ColorPrimaries);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Success_Subtitle_Async()
         {
-        var info = await FFProbe.AnalyseAsync(TestResources.SrtSubtitle, cancellationToken: TestContext.CancellationToken);
+            var info = await FFProbe.AnalyseAsync(TestResources.SrtSubtitle);
             Assert.IsNotNull(info.PrimarySubtitleStream);
-        Assert.HasCount(1, info.SubtitleStreams);
-        Assert.IsEmpty(info.AudioStreams);
-        Assert.IsEmpty(info.VideoStreams);
+            Assert.AreEqual(1, info.SubtitleStreams.Count);
+            Assert.AreEqual(0, info.AudioStreams.Count);
+            Assert.AreEqual(0, info.VideoStreams.Count);
             // BitDepth is meaningless for subtitles
             Assert.IsNull(info.SubtitleStreams[0].BitDepth);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Success_Disposition_Async()
         {
-        var info = await FFProbe.AnalyseAsync(TestResources.Mp4Video, cancellationToken: TestContext.CancellationToken);
+            var info = await FFProbe.AnalyseAsync(TestResources.Mp4Video);
             Assert.IsNotNull(info.PrimaryAudioStream);
             Assert.IsNotNull(info.PrimaryAudioStream.Disposition);
-        Assert.IsTrue(info.PrimaryAudioStream.Disposition["default"]);
-        Assert.IsFalse(info.PrimaryAudioStream.Disposition["forced"]);
+            Assert.AreEqual(true, info.PrimaryAudioStream.Disposition["default"]);
+            Assert.AreEqual(false, info.PrimaryAudioStream.Disposition["forced"]);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Success_Mp3AudioBitDepthNull_Async()
         {
-        var info = await FFProbe.AnalyseAsync(TestResources.Mp3Audio, cancellationToken: TestContext.CancellationToken);
+            var info = await FFProbe.AnalyseAsync(TestResources.Mp3Audio);
             Assert.IsNotNull(info.PrimaryAudioStream);
             // mp3 is lossy, so bit depth is meaningless.
             Assert.IsNull(info.PrimaryAudioStream.BitDepth);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Success_VocAudioBitDepth_Async()
         {
-        var info = await FFProbe.AnalyseAsync(TestResources.AiffAudio, cancellationToken: TestContext.CancellationToken);
+            var info = await FFProbe.AnalyseAsync(TestResources.AiffAudio);
             Assert.IsNotNull(info.PrimaryAudioStream);
             Assert.AreEqual(16, info.PrimaryAudioStream.BitDepth);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Success_MkvVideoBitDepth_Async()
         {
-        var info = await FFProbe.AnalyseAsync(TestResources.MkvVideo, cancellationToken: TestContext.CancellationToken);
-        Assert.IsNotNull(info.PrimaryVideoStream);
-        Assert.AreEqual(8, info.PrimaryVideoStream.BitDepth);
-
+            var info = await FFProbe.AnalyseAsync(TestResources.MkvVideo);
             Assert.IsNotNull(info.PrimaryAudioStream);
+            Assert.AreEqual(8, info.PrimaryVideoStream.BitDepth);
             Assert.IsNull(info.PrimaryAudioStream.BitDepth);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Success_24BitWavBitDepth_Async()
         {
-        var info = await FFProbe.AnalyseAsync(TestResources.Wav24Bit, cancellationToken: TestContext.CancellationToken);
+            var info = await FFProbe.AnalyseAsync(TestResources.Wav24Bit);
             Assert.IsNotNull(info.PrimaryAudioStream);
             Assert.AreEqual(24, info.PrimaryAudioStream.BitDepth);
         }
 
-    [TestMethod]
-    [Timeout(10000, CooperativeCancellation = true)]
+        [TestMethod, Timeout(10000)]
         public async Task Probe_Success_32BitWavBitDepth_Async()
         {
-        var info = await FFProbe.AnalyseAsync(TestResources.Wav32Bit, cancellationToken: TestContext.CancellationToken);
+            var info = await FFProbe.AnalyseAsync(TestResources.Wav32Bit);
             Assert.IsNotNull(info.PrimaryAudioStream);
             Assert.AreEqual(32, info.PrimaryAudioStream.BitDepth);
         }
@@ -286,3 +264,4 @@ public class FFProbeTests
             Assert.AreEqual(3, info.Duration.Seconds);
         }
     }
+}

FFMpegCore.Test/MetaDataBuilderTests.cs

@@ -1,8 +1,9 @@
 using System.Text.RegularExpressions;
 using FFMpegCore.Builders.MetaData;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace FFMpegCore.Test;
-
+namespace FFMpegCore.Test
+{
     [TestClass]
     public class MetaDataBuilderTests
     {
@@ -19,8 +20,10 @@ public class MetaDataBuilderTests
                 Genres = new[] { "Synthwave", "Classics" },
                 Tracks = new[]
                 {
-                new { Duration = TimeSpan.FromSeconds(10), Title = "Chapter 01" }, new { Duration = TimeSpan.FromSeconds(10), Title = "Chapter 02" },
-                new { Duration = TimeSpan.FromSeconds(10), Title = "Chapter 03" }, new { Duration = TimeSpan.FromSeconds(10), Title = "Chapter 04" }
+                    new { Duration = TimeSpan.FromSeconds(10), Title = "Chapter 01" },
+                    new { Duration = TimeSpan.FromSeconds(10), Title = "Chapter 02" },
+                    new { Duration = TimeSpan.FromSeconds(10), Title = "Chapter 03" },
+                    new { Duration = TimeSpan.FromSeconds(10), Title = "Chapter 04" },
                 }
             };
 
@@ -64,3 +67,4 @@ public class MetaDataBuilderTests
             Assert.IsTrue(Regex.IsMatch(text1, "metadata_[0-9a-f-]+\\.txt\" -map_metadata 2"), "map_metadata index is calculated incorrectly.");
         }
     }
+}

FFMpegCore.Test/PixelFormatTests.cs

@@ -1,7 +1,8 @@
 using FFMpegCore.Exceptions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace FFMpegCore.Test;
-
+namespace FFMpegCore.Test
+{
     [TestClass]
     public class PixelFormatTests
     {
@@ -9,7 +10,7 @@ public class PixelFormatTests
         public void PixelFormats_Enumerate()
         {
             var formats = FFMpeg.GetPixelFormats();
-        Assert.IsNotEmpty(formats);
+            Assert.IsTrue(formats.Count > 0);
         }
 
         [TestMethod]
@@ -34,6 +35,7 @@ public class PixelFormatTests
         [TestMethod]
         public void PixelFormats_GetNotExisting()
         {
-        Assert.ThrowsExactly<FFMpegException>(() => FFMpeg.GetPixelFormat("yuv420pppUnknown"));
+            Assert.ThrowsException<FFMpegException>(() => FFMpeg.GetPixelFormat("yuv420pppUnknown"));
+        }
     }
 }

FFMpegCore.Test/Resources/TestResources.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Test.Resources;
-
+namespace FFMpegCore.Test.Resources
+{
     public static class TestResources
     {
         public static readonly string Mp4Video = "./Resources/input_3sec.mp4";
@@ -19,3 +19,4 @@ public static class TestResources
         public static readonly string Wav24Bit = "./Resources/24_bit_fixed.WAV";
         public static readonly string Wav32Bit = "./Resources/32_bit_float.WAV";
     }
+}

FFMpegCore.Test/TemporaryFile.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Test;
-
+namespace FFMpegCore.Test
+{
     public class TemporaryFile : IDisposable
     {
         private readonly string _path;
@@ -9,6 +9,7 @@ public class TemporaryFile : IDisposable
             _path = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid()}-{filename}");
         }
 
+        public static implicit operator string(TemporaryFile temporaryFile) => temporaryFile._path;
         public void Dispose()
         {
             if (File.Exists(_path))
@@ -16,9 +17,5 @@ public class TemporaryFile : IDisposable
                 File.Delete(_path);
             }
         }
-
-    public static implicit operator string(TemporaryFile temporaryFile)
-    {
-        return temporaryFile._path;
     }
 }

FFMpegCore.Test/Utilities/BitmapSources.cs

@@ -2,12 +2,11 @@
 using System.Drawing.Imaging;
 using System.Numerics;
 using System.Runtime.Versioning;
-using FFMpegCore.Extensions.System.Drawing.Common;
 using FFMpegCore.Pipes;
 using SkiaSharp;
 
-namespace FFMpegCore.Test.Utilities;
-
+namespace FFMpegCore.Test.Utilities
+{
     internal static class BitmapSource
     {
         [SupportedOSPlatform("windows")]
@@ -34,7 +33,7 @@ internal static class BitmapSource
         }
 
         [SupportedOSPlatform("windows")]
-    public static BitmapVideoFrameWrapper CreateVideoFrame(int index, PixelFormat fmt, int w, int h, float scaleNoise, float offset)
+        public static Extensions.System.Drawing.Common.BitmapVideoFrameWrapper CreateVideoFrame(int index, PixelFormat fmt, int w, int h, float scaleNoise, float offset)
         {
             var bitmap = new Bitmap(w, h, fmt);
 
@@ -44,7 +43,7 @@ internal static class BitmapSource
                 bitmap.SetPixel(x, y, color);
             }
 
-        return new BitmapVideoFrameWrapper(bitmap);
+            return new Extensions.System.Drawing.Common.BitmapVideoFrameWrapper(bitmap);
         }
 
         public static Extensions.SkiaSharp.BitmapVideoFrameWrapper CreateVideoFrame(int index, SKColorType fmt, int w, int h, float scaleNoise, float offset)
@@ -58,8 +57,7 @@ internal static class BitmapSource
             return new Extensions.SkiaSharp.BitmapVideoFrameWrapper(bitmap);
         }
 
-    private static IEnumerable<(int x, int y, byte red, byte green, byte blue)> GenerateVideoFramePixels(int index, int w, int h, float scaleNoise,
-        float offset)
+        private static IEnumerable<(int x, int y, byte red, byte green, byte blue)> GenerateVideoFramePixels(int index, int w, int h, float scaleNoise, float offset)
         {
             offset = offset * index;
 
@@ -74,7 +72,7 @@ internal static class BitmapSource
 
                     var value = (byte)((Perlin.Noise(nx, ny) + 1.0f) / 2.0f * 255);
 
-                yield return (x, y, (byte)(value * xf), (byte)(value * yf), value);
+                    yield return ((x, y, (byte)(value * xf), (byte)(value * yf), value));
                 }
             }
         }
@@ -230,23 +228,28 @@ internal static class BitmapSource
             {
                 var h = hash & 15;
                 var u = h < 8 ? x : y;
-            var v = h < 4 ? y : h == 12 || h == 14 ? x : z;
+                var v = h < 4 ? y : (h == 12 || h == 14 ? x : z);
                 return ((h & 1) == 0 ? u : -u) + ((h & 2) == 0 ? v : -v);
             }
 
-        private static readonly int[] perm =
-        {
-            151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247,
-            120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74,
-            165, 71, 134, 139, 48, 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102, 143, 54,
-            65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86, 164, 100, 109, 198, 173, 186, 3,
-            64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183,
-            170, 213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178,
-            185, 112, 104, 218, 246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, 14, 239, 107, 49, 192, 214,
-            31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195,
-            78, 66, 215, 61, 156, 180, 151
+            private static readonly int[] perm = {
+        151,160,137,91,90,15,
+        131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23,
+        190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33,
+        88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166,
+        77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244,
+        102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196,
+        135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123,
+        5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42,
+        223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9,
+        129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228,
+        251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107,
+        49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254,
+        138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180,
+        151
     };
 
             #endregion
         }
     }
+}

FFMpegCore.Test/Utilities/WindowsOnlyDataTestMethod.cs

@@ -0,0 +1,23 @@
+using System.Runtime.InteropServices;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace FFMpegCore.Test.Utilities;
+
+public class WindowsOnlyDataTestMethod : DataTestMethodAttribute
+{
+    public override TestResult[] Execute(ITestMethod testMethod)
+    {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            var message = $"Test not executed on other platforms than Windows";
+            {
+                return new[]
+                {
+                    new TestResult { Outcome = UnitTestOutcome.Inconclusive, TestFailureException = new AssertInconclusiveException(message) }
+                };
+            }
+        }
+
+        return base.Execute(testMethod);
+    }
+}

FFMpegCore.Test/Utilities/WindowsOnlyTestMethod.cs

@@ -1,28 +1,23 @@
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace FFMpegCore.Test.Utilities;
 
 public class WindowsOnlyTestMethod : TestMethodAttribute
 {
-    public WindowsOnlyTestMethod([CallerFilePath] string callerFilePath = "", [CallerLineNumber] int callerLineNumber = -1)
-        : base(callerFilePath, callerLineNumber)
-    {
-    }
-
-    public override async Task<TestResult[]> ExecuteAsync(ITestMethod testMethod)
+    public override TestResult[] Execute(ITestMethod testMethod)
     {
         if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            var message = "Test not executed on other platforms than Windows";
+            var message = $"Test not executed on other platforms than Windows";
+            {
+                return new[]
                 {
-                return
-                [
                     new TestResult { Outcome = UnitTestOutcome.Inconclusive, TestFailureException = new AssertInconclusiveException(message) }
-                ];
+                };
             }
         }
 
-        return await base.ExecuteAsync(testMethod);
+        return base.Execute(testMethod);
     }
 }

FFMpegCore.Test/VideoTest.cs

@@ -5,24 +5,19 @@ using System.Text;
 using FFMpegCore.Arguments;
 using FFMpegCore.Enums;
 using FFMpegCore.Exceptions;
-using FFMpegCore.Extensions.System.Drawing.Common;
 using FFMpegCore.Pipes;
 using FFMpegCore.Test.Resources;
 using FFMpegCore.Test.Utilities;
-using SkiaSharp;
-using PixelFormat = System.Drawing.Imaging.PixelFormat;
-
-namespace FFMpegCore.Test;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
+namespace FFMpegCore.Test
+{
     [TestClass]
     public class VideoTest
     {
         private const int BaseTimeoutMilliseconds = 15_000;
 
-    public TestContext TestContext { get; set; }
-
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToOGV()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Ogv.Extension}");
@@ -34,8 +29,7 @@ public class VideoTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToMP4()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
@@ -47,8 +41,7 @@ public class VideoTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToMP4_YUV444p()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
@@ -61,11 +54,10 @@ public class VideoTest
                 .ProcessSynchronously();
             Assert.IsTrue(success);
             var analysis = FFProbe.Analyse(outputFile);
-        Assert.AreEqual("yuv444p", analysis.VideoStreams.First().PixelFormat);
+            Assert.IsTrue(analysis.VideoStreams.First().PixelFormat == "yuv444p");
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToMP4_Args()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
@@ -78,11 +70,10 @@ public class VideoTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToH265_MKV_Args()
         {
-        using var outputFile = new TemporaryFile("out.mkv");
+            using var outputFile = new TemporaryFile($"out.mkv");
 
             var success = FFMpegArguments
                 .FromFileInput(TestResources.WebmVideo)
@@ -93,23 +84,15 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    [DataRow(PixelFormat.Format24bppRgb)]
-    [DataRow(PixelFormat.Format32bppArgb)]
-    public void Video_ToMP4_Args_Pipe_WindowsOnly(PixelFormat pixelFormat)
-    {
-        Video_ToMP4_Args_Pipe_Internal(pixelFormat);
-    }
+        [WindowsOnlyDataTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        [DataRow(System.Drawing.Imaging.PixelFormat.Format24bppRgb)]
+        [DataRow(System.Drawing.Imaging.PixelFormat.Format32bppArgb)]
+        public void Video_ToMP4_Args_Pipe_WindowsOnly(System.Drawing.Imaging.PixelFormat pixelFormat) => Video_ToMP4_Args_Pipe_Internal(pixelFormat);
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    [DataRow(SKColorType.Rgb565)]
-    [DataRow(SKColorType.Bgra8888)]
-    public void Video_ToMP4_Args_Pipe(SKColorType pixelFormat)
-    {
-        Video_ToMP4_Args_Pipe_Internal(pixelFormat);
-    }
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
+        [DataRow(SkiaSharp.SKColorType.Rgb565)]
+        [DataRow(SkiaSharp.SKColorType.Bgra8888)]
+        public void Video_ToMP4_Args_Pipe(SkiaSharp.SKColorType pixelFormat) => Video_ToMP4_Args_Pipe_Internal(pixelFormat);
 
         private static void Video_ToMP4_Args_Pipe_Internal(dynamic pixelFormat)
         {
@@ -125,19 +108,11 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_ToMP4_Args_Pipe_DifferentImageSizes_WindowsOnly()
-    {
-        Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal(PixelFormat.Format24bppRgb);
-    }
+        [WindowsOnlyTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public void Video_ToMP4_Args_Pipe_DifferentImageSizes_WindowsOnly() => Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal(System.Drawing.Imaging.PixelFormat.Format24bppRgb);
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_ToMP4_Args_Pipe_DifferentImageSizes()
-    {
-        Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal(SKColorType.Rgb565);
-    }
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public void Video_ToMP4_Args_Pipe_DifferentImageSizes() => Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal(SkiaSharp.SKColorType.Rgb565);
 
         private static void Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal(dynamic pixelFormat)
         {
@@ -145,11 +120,12 @@ public class VideoTest
 
             var frames = new List<IVideoFrame>
             {
-            BitmapSource.CreateVideoFrame(0, pixelFormat, 255, 255, 1, 0), BitmapSource.CreateVideoFrame(0, pixelFormat, 256, 256, 1, 0)
+                BitmapSource.CreateVideoFrame(0, pixelFormat, 255, 255, 1, 0),
+                BitmapSource.CreateVideoFrame(0, pixelFormat, 256, 256, 1, 0)
             };
 
             var videoFramesSource = new RawVideoPipeSource(frames);
-        Assert.ThrowsExactly<FFMpegStreamFormatException>(() => FFMpegArguments
+            var ex = Assert.ThrowsException<FFMpegStreamFormatException>(() => FFMpegArguments
               .FromPipeInput(videoFramesSource)
               .OutputToFile(outputFile, false, opt => opt
                   .WithVideoCodec(VideoCodec.LibX264))
@@ -157,19 +133,11 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public async Task Video_ToMP4_Args_Pipe_DifferentImageSizes_WindowsOnly_Async()
-    {
-        await Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal_Async(PixelFormat.Format24bppRgb);
-    }
+        [WindowsOnlyTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public async Task Video_ToMP4_Args_Pipe_DifferentImageSizes_WindowsOnly_Async() => await Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal_Async(System.Drawing.Imaging.PixelFormat.Format24bppRgb);
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public async Task Video_ToMP4_Args_Pipe_DifferentImageSizes_Async()
-    {
-        await Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal_Async(SKColorType.Rgb565);
-    }
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public async Task Video_ToMP4_Args_Pipe_DifferentImageSizes_Async() => await Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal_Async(SkiaSharp.SKColorType.Rgb565);
 
         private static async Task Video_ToMP4_Args_Pipe_DifferentImageSizes_Internal_Async(dynamic pixelFormat)
         {
@@ -177,11 +145,12 @@ public class VideoTest
 
             var frames = new List<IVideoFrame>
             {
-            BitmapSource.CreateVideoFrame(0, pixelFormat, 255, 255, 1, 0), BitmapSource.CreateVideoFrame(0, pixelFormat, 256, 256, 1, 0)
+                BitmapSource.CreateVideoFrame(0, pixelFormat, 255, 255, 1, 0),
+                BitmapSource.CreateVideoFrame(0, pixelFormat, 256, 256, 1, 0)
             };
 
             var videoFramesSource = new RawVideoPipeSource(frames);
-        await Assert.ThrowsExactlyAsync<FFMpegStreamFormatException>(() => FFMpegArguments
+            var ex = await Assert.ThrowsExceptionAsync<FFMpegStreamFormatException>(() => FFMpegArguments
               .FromPipeInput(videoFramesSource)
               .OutputToFile(outputFile, false, opt => opt
                   .WithVideoCodec(VideoCodec.LibX264))
@@ -189,20 +158,12 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_ToMP4_Args_Pipe_DifferentPixelFormats_WindowsOnly()
-    {
-        Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal(PixelFormat.Format24bppRgb,
-            PixelFormat.Format32bppRgb);
-    }
+        [WindowsOnlyTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public void Video_ToMP4_Args_Pipe_DifferentPixelFormats_WindowsOnly() =>
+            Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal(System.Drawing.Imaging.PixelFormat.Format24bppRgb, System.Drawing.Imaging.PixelFormat.Format32bppRgb);
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_ToMP4_Args_Pipe_DifferentPixelFormats()
-    {
-        Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal(SKColorType.Rgb565, SKColorType.Bgra8888);
-    }
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public void Video_ToMP4_Args_Pipe_DifferentPixelFormats() => Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal(SkiaSharp.SKColorType.Rgb565, SkiaSharp.SKColorType.Bgra8888);
 
         private static void Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal(dynamic pixelFormatFrame1, dynamic pixelFormatFrame2)
         {
@@ -210,11 +171,12 @@ public class VideoTest
 
             var frames = new List<IVideoFrame>
             {
-            BitmapSource.CreateVideoFrame(0, pixelFormatFrame1, 255, 255, 1, 0), BitmapSource.CreateVideoFrame(0, pixelFormatFrame2, 255, 255, 1, 0)
+                BitmapSource.CreateVideoFrame(0, pixelFormatFrame1, 255, 255, 1, 0),
+                BitmapSource.CreateVideoFrame(0, pixelFormatFrame2, 255, 255, 1, 0)
             };
 
             var videoFramesSource = new RawVideoPipeSource(frames);
-        Assert.ThrowsExactly<FFMpegStreamFormatException>(() => FFMpegArguments
+            var ex = Assert.ThrowsException<FFMpegStreamFormatException>(() => FFMpegArguments
               .FromPipeInput(videoFramesSource)
               .OutputToFile(outputFile, false, opt => opt
                   .WithVideoCodec(VideoCodec.LibX264))
@@ -222,20 +184,12 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public async Task Video_ToMP4_Args_Pipe_DifferentPixelFormats_WindowsOnly_Async()
-    {
-        await Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal_Async(PixelFormat.Format24bppRgb,
-            PixelFormat.Format32bppRgb);
-    }
+        [WindowsOnlyTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public async Task Video_ToMP4_Args_Pipe_DifferentPixelFormats_WindowsOnly_Async() =>
+            await Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal_Async(System.Drawing.Imaging.PixelFormat.Format24bppRgb, System.Drawing.Imaging.PixelFormat.Format32bppRgb);
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public async Task Video_ToMP4_Args_Pipe_DifferentPixelFormats_Async()
-    {
-        await Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal_Async(SKColorType.Rgb565, SKColorType.Bgra8888);
-    }
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public async Task Video_ToMP4_Args_Pipe_DifferentPixelFormats_Async() => await Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal_Async(SkiaSharp.SKColorType.Rgb565, SkiaSharp.SKColorType.Bgra8888);
 
         private static async Task Video_ToMP4_Args_Pipe_DifferentPixelFormats_Internal_Async(dynamic pixelFormatFrame1, dynamic pixelFormatFrame2)
         {
@@ -243,19 +197,19 @@ public class VideoTest
 
             var frames = new List<IVideoFrame>
             {
-            BitmapSource.CreateVideoFrame(0, pixelFormatFrame1, 255, 255, 1, 0), BitmapSource.CreateVideoFrame(0, pixelFormatFrame2, 255, 255, 1, 0)
+                BitmapSource.CreateVideoFrame(0, pixelFormatFrame1, 255, 255, 1, 0),
+                BitmapSource.CreateVideoFrame(0, pixelFormatFrame2, 255, 255, 1, 0)
             };
 
             var videoFramesSource = new RawVideoPipeSource(frames);
-        await Assert.ThrowsExactlyAsync<FFMpegStreamFormatException>(() => FFMpegArguments
+            var ex = await Assert.ThrowsExceptionAsync<FFMpegStreamFormatException>(() => FFMpegArguments
               .FromPipeInput(videoFramesSource)
               .OutputToFile(outputFile, false, opt => opt
                   .WithVideoCodec(VideoCodec.LibX264))
               .ProcessAsynchronously());
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToMP4_Args_StreamPipe()
         {
             using var input = File.OpenRead(TestResources.WebmVideo);
@@ -269,11 +223,10 @@ public class VideoTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_ToMP4_Args_StreamOutputPipe_Async_Failure()
         {
-        await Assert.ThrowsExactlyAsync<FFMpegException>(async () =>
+            await Assert.ThrowsExceptionAsync<FFMpegException>(async () =>
             {
                 await using var ms = new MemoryStream();
                 var pipeSource = new StreamPipeSink(ms);
@@ -284,8 +237,7 @@ public class VideoTest
             });
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_StreamFile_OutputToMemoryStream()
         {
             var output = new MemoryStream();
@@ -302,11 +254,10 @@ public class VideoTest
             Console.WriteLine(result.Duration);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToMP4_Args_StreamOutputPipe_Failure()
         {
-        Assert.ThrowsExactly<FFMpegException>(() =>
+            Assert.ThrowsException<FFMpegException>(() =>
             {
                 using var ms = new MemoryStream();
                 FFMpegArguments
@@ -317,8 +268,7 @@ public class VideoTest
             });
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_ToMP4_Args_StreamOutputPipe_Async()
         {
             await using var ms = new MemoryStream();
@@ -331,8 +281,7 @@ public class VideoTest
                 .ProcessAsynchronously();
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task TestDuplicateRun()
         {
             FFMpegArguments
@@ -348,8 +297,7 @@ public class VideoTest
             File.Delete("temporary.mp4");
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void TranscodeToMemoryStream_Success()
         {
             using var output = new MemoryStream();
@@ -367,8 +315,7 @@ public class VideoTest
             Assert.AreEqual(inputAnalysis.Duration.TotalSeconds, outputAnalysis.Duration.TotalSeconds, 0.3);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToTS()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.MpegTs.Extension}");
@@ -380,8 +327,7 @@ public class VideoTest
             Assert.IsTrue(success);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_ToTS_Args()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.MpegTs.Extension}");
@@ -397,23 +343,15 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    [DataRow(PixelFormat.Format24bppRgb)]
-    [DataRow(PixelFormat.Format32bppArgb)]
-    public async Task Video_ToTS_Args_Pipe_WindowsOnly(PixelFormat pixelFormat)
-    {
-        await Video_ToTS_Args_Pipe_Internal(pixelFormat);
-    }
+        [WindowsOnlyDataTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        [DataRow(System.Drawing.Imaging.PixelFormat.Format24bppRgb)]
+        [DataRow(System.Drawing.Imaging.PixelFormat.Format32bppArgb)]
+        public async Task Video_ToTS_Args_Pipe_WindowsOnly(System.Drawing.Imaging.PixelFormat pixelFormat) => await Video_ToTS_Args_Pipe_Internal(pixelFormat);
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    [DataRow(SKColorType.Rgb565)]
-    [DataRow(SKColorType.Bgra8888)]
-    public async Task Video_ToTS_Args_Pipe(SKColorType pixelFormat)
-    {
-        await Video_ToTS_Args_Pipe_Internal(pixelFormat);
-    }
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
+        [DataRow(SkiaSharp.SKColorType.Rgb565)]
+        [DataRow(SkiaSharp.SKColorType.Bgra8888)]
+        public async Task Video_ToTS_Args_Pipe(SkiaSharp.SKColorType pixelFormat) => await Video_ToTS_Args_Pipe_Internal(pixelFormat);
 
         private static async Task Video_ToTS_Args_Pipe_Internal(dynamic pixelFormat)
         {
@@ -431,8 +369,7 @@ public class VideoTest
             Assert.AreEqual(VideoType.Ts.Name, analysis.Format.FormatName);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_ToOGV_Resize()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Ogv.Extension}");
@@ -446,11 +383,10 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    [DataRow(SKColorType.Rgb565)]
-    [DataRow(SKColorType.Bgra8888)]
-    public void RawVideoPipeSource_Ogv_Scale(SKColorType pixelFormat)
+        [WindowsOnlyDataTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        [DataRow(SkiaSharp.SKColorType.Rgb565)]
+        [DataRow(SkiaSharp.SKColorType.Bgra8888)]
+        public void RawVideoPipeSource_Ogv_Scale(SkiaSharp.SKColorType pixelFormat)
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Ogv.Extension}");
             var videoFramesSource = new RawVideoPipeSource(BitmapSource.CreateBitmaps(128, pixelFormat, 256, 256));
@@ -467,8 +403,7 @@ public class VideoTest
             Assert.AreEqual((int)VideoSize.Ed, analysis.PrimaryVideoStream!.Width);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Scale_Mp4_Multithreaded()
         {
             using var outputFile = new TemporaryFile($"out{VideoType.Mp4.Extension}");
@@ -483,24 +418,16 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    [DataRow(PixelFormat.Format24bppRgb)]
-    [DataRow(PixelFormat.Format32bppArgb)]
+        [WindowsOnlyDataTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        [DataRow(System.Drawing.Imaging.PixelFormat.Format24bppRgb)]
+        [DataRow(System.Drawing.Imaging.PixelFormat.Format32bppArgb)]
         // [DataRow(PixelFormat.Format48bppRgb)]
-    public void Video_ToMP4_Resize_Args_Pipe(PixelFormat pixelFormat)
-    {
-        Video_ToMP4_Resize_Args_Pipe_Internal(pixelFormat);
-    }
+        public void Video_ToMP4_Resize_Args_Pipe(System.Drawing.Imaging.PixelFormat pixelFormat) => Video_ToMP4_Resize_Args_Pipe_Internal(pixelFormat);
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    [DataRow(SKColorType.Rgb565)]
-    [DataRow(SKColorType.Bgra8888)]
-    public void Video_ToMP4_Resize_Args_Pipe(SKColorType pixelFormat)
-    {
-        Video_ToMP4_Resize_Args_Pipe_Internal(pixelFormat);
-    }
+        [DataTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        [DataRow(SkiaSharp.SKColorType.Rgb565)]
+        [DataRow(SkiaSharp.SKColorType.Bgra8888)]
+        public void Video_ToMP4_Resize_Args_Pipe(SkiaSharp.SKColorType pixelFormat) => Video_ToMP4_Resize_Args_Pipe_Internal(pixelFormat);
 
         private static void Video_ToMP4_Resize_Args_Pipe_Internal(dynamic pixelFormat)
         {
@@ -516,11 +443,10 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [WindowsOnlyTestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_Snapshot_InMemory_SystemDrawingCommon()
         {
-        using var bitmap = FFMpegImage.Snapshot(TestResources.Mp4Video);
+            using var bitmap = Extensions.System.Drawing.Common.FFMpegImage.Snapshot(TestResources.Mp4Video);
 
             var input = FFProbe.Analyse(TestResources.Mp4Video);
             Assert.AreEqual(input.PrimaryVideoStream!.Width, bitmap.Width);
@@ -528,8 +454,7 @@ public class VideoTest
             Assert.AreEqual(bitmap.RawFormat, ImageFormat.Png);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_Snapshot_InMemory_SkiaSharp()
         {
             using var bitmap = Extensions.SkiaSharp.FFMpegImage.Snapshot(TestResources.Mp4Video);
@@ -541,9 +466,8 @@ public class VideoTest
             // e.g. Bgra8888 on Windows and Rgba8888 on macOS.
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_Snapshot_Png_PersistSnapshot()
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public void Video_Snapshot_PersistSnapshot()
         {
             using var outputPath = new TemporaryFile("out.png");
             var input = FFProbe.Analyse(TestResources.Mp4Video);
@@ -556,69 +480,7 @@ public class VideoTest
             Assert.AreEqual("png", analysis.PrimaryVideoStream!.CodecName);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_Snapshot_Jpg_PersistSnapshot()
-    {
-        using var outputPath = new TemporaryFile("out.jpg");
-        var input = FFProbe.Analyse(TestResources.Mp4Video);
-
-        FFMpeg.Snapshot(TestResources.Mp4Video, outputPath);
-
-        var analysis = FFProbe.Analyse(outputPath);
-        Assert.AreEqual(input.PrimaryVideoStream!.Width, analysis.PrimaryVideoStream!.Width);
-        Assert.AreEqual(input.PrimaryVideoStream.Height, analysis.PrimaryVideoStream!.Height);
-        Assert.AreEqual("mjpeg", analysis.PrimaryVideoStream!.CodecName);
-    }
-
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_Snapshot_Bmp_PersistSnapshot()
-    {
-        using var outputPath = new TemporaryFile("out.bmp");
-        var input = FFProbe.Analyse(TestResources.Mp4Video);
-
-        FFMpeg.Snapshot(TestResources.Mp4Video, outputPath);
-
-        var analysis = FFProbe.Analyse(outputPath);
-        Assert.AreEqual(input.PrimaryVideoStream!.Width, analysis.PrimaryVideoStream!.Width);
-        Assert.AreEqual(input.PrimaryVideoStream.Height, analysis.PrimaryVideoStream!.Height);
-        Assert.AreEqual("bmp", analysis.PrimaryVideoStream!.CodecName);
-    }
-
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_Snapshot_Webp_PersistSnapshot()
-    {
-        using var outputPath = new TemporaryFile("out.webp");
-        var input = FFProbe.Analyse(TestResources.Mp4Video);
-
-        FFMpeg.Snapshot(TestResources.Mp4Video, outputPath);
-
-        var analysis = FFProbe.Analyse(outputPath);
-        Assert.AreEqual(input.PrimaryVideoStream!.Width, analysis.PrimaryVideoStream!.Width);
-        Assert.AreEqual(input.PrimaryVideoStream.Height, analysis.PrimaryVideoStream!.Height);
-        Assert.AreEqual("webp", analysis.PrimaryVideoStream!.CodecName);
-    }
-
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_Snapshot_Exception_PersistSnapshot()
-    {
-        using var outputPath = new TemporaryFile("out.asd");
-
-        try
-        {
-            FFMpeg.Snapshot(TestResources.Mp4Video, outputPath);
-        }
-        catch (Exception ex)
-        {
-            Assert.IsTrue(ex is ArgumentException);
-        }
-    }
-
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_Snapshot_Rotated_PersistSnapshot()
         {
             using var outputPath = new TemporaryFile("out.png");
@@ -633,8 +495,7 @@ public class VideoTest
             Assert.AreEqual("png", analysis.PrimaryVideoStream!.CodecName);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_GifSnapshot_PersistSnapshot()
         {
             using var outputPath = new TemporaryFile("out.gif");
@@ -648,15 +509,14 @@ public class VideoTest
             Assert.AreEqual("gif", analysis.PrimaryVideoStream!.CodecName);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_GifSnapshot_PersistSnapshot_SizeSupplied()
         {
             using var outputPath = new TemporaryFile("out.gif");
             var input = FFProbe.Analyse(TestResources.Mp4Video);
             var desiredGifSize = new Size(320, 240);
 
-        FFMpeg.GifSnapshot(TestResources.Mp4Video, outputPath, desiredGifSize, TimeSpan.FromSeconds(0));
+            FFMpeg.GifSnapshot(TestResources.Mp4Video, outputPath, desiredGifSize, captureTime: TimeSpan.FromSeconds(0));
 
             var analysis = FFProbe.Analyse(outputPath);
             Assert.AreNotEqual(input.PrimaryVideoStream!.Width, desiredGifSize.Width);
@@ -664,8 +524,7 @@ public class VideoTest
             Assert.AreEqual("gif", analysis.PrimaryVideoStream!.CodecName);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_GifSnapshot_PersistSnapshotAsync()
         {
             using var outputPath = new TemporaryFile("out.gif");
@@ -679,15 +538,14 @@ public class VideoTest
             Assert.AreEqual("gif", analysis.PrimaryVideoStream!.CodecName);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_GifSnapshot_PersistSnapshotAsync_SizeSupplied()
         {
             using var outputPath = new TemporaryFile("out.gif");
             var input = FFProbe.Analyse(TestResources.Mp4Video);
             var desiredGifSize = new Size(320, 240);
 
-        await FFMpeg.GifSnapshotAsync(TestResources.Mp4Video, outputPath, desiredGifSize, TimeSpan.FromSeconds(0));
+            await FFMpeg.GifSnapshotAsync(TestResources.Mp4Video, outputPath, desiredGifSize, captureTime: TimeSpan.FromSeconds(0));
 
             var analysis = FFProbe.Analyse(outputPath);
             Assert.AreNotEqual(input.PrimaryVideoStream!.Width, desiredGifSize.Width);
@@ -695,8 +553,7 @@ public class VideoTest
             Assert.AreEqual("gif", analysis.PrimaryVideoStream!.CodecName);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_Join()
         {
             using var inputCopy = new TemporaryFile("copy-input.mp4");
@@ -718,8 +575,7 @@ public class VideoTest
             Assert.AreEqual(input.PrimaryVideoStream.Width, result.PrimaryVideoStream.Width);
         }
 
-    [TestMethod]
-    [Timeout(2 * BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(2 * BaseTimeoutMilliseconds)]
         public void Video_Join_Image_Sequence()
         {
             var imageSet = new List<string>();
@@ -735,7 +591,7 @@ public class VideoTest
             var imageAnalysis = FFProbe.Analyse(imageSet.First());
 
             using var outputFile = new TemporaryFile("out.mp4");
-        var success = FFMpeg.JoinImageSequence(outputFile, 10, imageSet.ToArray());
+            var success = FFMpeg.JoinImageSequence(outputFile, frameRate: 10, images: imageSet.ToArray());
             Assert.IsTrue(success);
             var result = FFProbe.Analyse(outputFile);
 
@@ -744,18 +600,16 @@ public class VideoTest
             Assert.AreEqual(imageAnalysis.PrimaryVideoStream!.Height, result.PrimaryVideoStream.Height);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_With_Only_Audio_Should_Extract_Metadata()
         {
             var video = FFProbe.Analyse(TestResources.Mp4WithoutVideo);
-        Assert.IsNull(video.PrimaryVideoStream);
+            Assert.AreEqual(null, video.PrimaryVideoStream);
             Assert.AreEqual("aac", video.PrimaryAudioStream!.CodecName);
             Assert.AreEqual(10, video.Duration.TotalSeconds, 0.5);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_Duration()
         {
             var video = FFProbe.Analyse(TestResources.Mp4Video);
@@ -775,8 +629,7 @@ public class VideoTest
             Assert.AreEqual(video.Duration.Seconds - 2, outputVideo.Duration.Seconds);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_UpdatesProgress()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -817,8 +670,7 @@ public class VideoTest
             Assert.AreNotEqual(analysis.Duration, timeDone);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_OutputsData()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -840,19 +692,11 @@ public class VideoTest
         }
 
         [SupportedOSPlatform("windows")]
-    [WindowsOnlyTestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_TranscodeInMemory_WindowsOnly()
-    {
-        Video_TranscodeInMemory_Internal(PixelFormat.Format24bppRgb);
-    }
+        [WindowsOnlyTestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public void Video_TranscodeInMemory_WindowsOnly() => Video_TranscodeInMemory_Internal(System.Drawing.Imaging.PixelFormat.Format24bppRgb);
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
-    public void Video_TranscodeInMemory()
-    {
-        Video_TranscodeInMemory_Internal(SKColorType.Rgb565);
-    }
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
+        public void Video_TranscodeInMemory() => Video_TranscodeInMemory_Internal(SkiaSharp.SKColorType.Rgb565);
 
         private static void Video_TranscodeInMemory_Internal(dynamic pixelFormat)
         {
@@ -869,12 +713,11 @@ public class VideoTest
 
             resStream.Position = 0;
             var vi = FFProbe.Analyse(resStream);
-        Assert.AreEqual(128, vi.PrimaryVideoStream!.Width);
-        Assert.AreEqual(128, vi.PrimaryVideoStream.Height);
+            Assert.AreEqual(vi.PrimaryVideoStream!.Width, 128);
+            Assert.AreEqual(vi.PrimaryVideoStream.Height, 128);
         }
 
-    [TestMethod]
-    [Timeout(2 * BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(2 * BaseTimeoutMilliseconds)]
         public void Video_TranscodeToMemory()
         {
             using var memoryStream = new MemoryStream();
@@ -888,12 +731,11 @@ public class VideoTest
 
             memoryStream.Position = 0;
             var vi = FFProbe.Analyse(memoryStream);
-        Assert.AreEqual(640, vi.PrimaryVideoStream!.Width);
-        Assert.AreEqual(360, vi.PrimaryVideoStream.Height);
+            Assert.AreEqual(vi.PrimaryVideoStream!.Width, 640);
+            Assert.AreEqual(vi.PrimaryVideoStream.Height, 360);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_Cancel_Async()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -909,7 +751,7 @@ public class VideoTest
                 .CancellableThrough(out var cancel)
                 .ProcessAsynchronously(false);
 
-        await Task.Delay(300, TestContext.CancellationToken);
+            await Task.Delay(300);
             cancel();
 
             var result = await task;
@@ -917,8 +759,7 @@ public class VideoTest
             Assert.IsFalse(result);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_Cancel()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -932,15 +773,14 @@ public class VideoTest
                     .WithSpeedPreset(Speed.VeryFast))
                 .CancellableThrough(out var cancel);
 
-        Task.Delay(300, TestContext.CancellationToken).ContinueWith(_ => cancel(), TestContext.CancellationToken);
+            Task.Delay(300).ContinueWith((_) => cancel());
 
             var result = task.ProcessSynchronously(false);
 
             Assert.IsFalse(result);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_Cancel_Async_With_Timeout()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -956,12 +796,12 @@ public class VideoTest
                 .CancellableThrough(out var cancel, 10000)
                 .ProcessAsynchronously(false);
 
-        await Task.Delay(300, TestContext.CancellationToken);
+            await Task.Delay(300);
             cancel();
 
             await task;
 
-        var outputInfo = await FFProbe.AnalyseAsync(outputFile, cancellationToken: TestContext.CancellationToken);
+            var outputInfo = await FFProbe.AnalyseAsync(outputFile);
 
             Assert.IsNotNull(outputInfo);
             Assert.AreEqual(320, outputInfo.PrimaryVideoStream!.Width);
@@ -970,8 +810,7 @@ public class VideoTest
             Assert.AreEqual("aac", outputInfo.PrimaryAudioStream!.CodecName);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_Cancel_CancellationToken_Async()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -996,8 +835,7 @@ public class VideoTest
             Assert.IsFalse(result);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_Cancel_CancellationToken_Async_Throws()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -1017,11 +855,10 @@ public class VideoTest
 
             cts.CancelAfter(300);
 
-        await Assert.ThrowsExactlyAsync<OperationCanceledException>(() => task);
+            await Assert.ThrowsExceptionAsync<OperationCanceledException>(() => task);
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_Cancel_CancellationToken_Throws()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -1040,11 +877,10 @@ public class VideoTest
 
             cts.CancelAfter(300);
 
-        Assert.ThrowsExactly<OperationCanceledException>(() => task.ProcessSynchronously());
+            Assert.ThrowsException<OperationCanceledException>(() => task.ProcessSynchronously());
         }
 
-    [TestMethod]
-    [Timeout(BaseTimeoutMilliseconds, CooperativeCancellation = true)]
+        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public async Task Video_Cancel_CancellationToken_Async_With_Timeout()
         {
             using var outputFile = new TemporaryFile("out.mp4");
@@ -1066,7 +902,7 @@ public class VideoTest
 
             await task;
 
-        var outputInfo = await FFProbe.AnalyseAsync(outputFile, cancellationToken: TestContext.CancellationToken);
+            var outputInfo = await FFProbe.AnalyseAsync(outputFile);
 
             Assert.IsNotNull(outputInfo);
             Assert.AreEqual(320, outputInfo.PrimaryVideoStream!.Width);
@@ -1075,3 +911,4 @@ public class VideoTest
             Assert.AreEqual("aac", outputInfo.PrimaryAudioStream!.CodecName);
         }
     }
+}

FFMpegCore/Extend/KeyValuePairExtensions.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Extend;
-
+namespace FFMpegCore.Extend
+{
     internal static class KeyValuePairExtensions
     {
         /// <summary>
@@ -19,3 +19,4 @@ internal static class KeyValuePairExtensions
             return $"{key}={value}";
         }
     }
+}

FFMpegCore/Extend/PcmAudioSampleWrapper.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Pipes;
 
-namespace FFMpegCore.Extend;
-
+namespace FFMpegCore.Extend
+{
     public class PcmAudioSampleWrapper : IAudioSample
     {
         //This could actually be short or int, but copies would be inefficient.
@@ -24,3 +24,4 @@ public class PcmAudioSampleWrapper : IAudioSample
             await stream.WriteAsync(_sample, 0, _sample.Length, token).ConfigureAwait(false);
         }
     }
+}

FFMpegCore/Extend/StringExtensions.cs

@@ -1,7 +1,7 @@
 using System.Text;
 
-namespace FFMpegCore.Extend;
-
+namespace FFMpegCore.Extend
+{
     internal static class StringExtensions
     {
         private static Dictionary<char, string> CharactersSubstitution { get; } = new()
@@ -66,3 +66,4 @@ internal static class StringExtensions
             return parsedString.ToString();
         }
     }
+}

FFMpegCore/Extend/UriExtensions.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Extend;
-
+namespace FFMpegCore.Extend
+{
     public static class UriExtensions
     {
         public static bool SaveStream(this Uri uri, string output)
@@ -7,3 +7,4 @@ public static class UriExtensions
             return FFMpeg.SaveM3U8Stream(uri, output);
         }
     }
+}

FFMpegCore/FFMpeg/Arguments/AudibleEncryptionKeyArgument.cs

@@ -1,13 +1,13 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class AudibleEncryptionKeyArgument : IArgument
     {
         private readonly bool _aaxcMode;
 
-    private readonly string? _activationBytes;
+        private readonly string? _key;
         private readonly string? _iv;
 
-    private readonly string? _key;
+        private readonly string? _activationBytes;
 
         public AudibleEncryptionKeyArgument(string activationBytes)
         {
@@ -24,3 +24,4 @@ public class AudibleEncryptionKeyArgument : IArgument
 
         public string Text => _aaxcMode ? $"-audible_key {_key} -audible_iv {_iv}" : $"-activation_bytes {_activationBytes}";
     }
+}

FFMpegCore/FFMpeg/Arguments/AudioBitrateArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents parameter of audio codec and it's quality
     /// </summary>
@@ -9,7 +9,6 @@ public class AudioBitrateArgument : IArgument
     {
         public readonly int Bitrate;
         public AudioBitrateArgument(AudioQuality value) : this((int)value) { }
-
         public AudioBitrateArgument(int bitrate)
         {
             Bitrate = bitrate;
@@ -17,3 +16,4 @@ public class AudioBitrateArgument : IArgument
 
         public string Text => $"-b:a {Bitrate}k";
     }
+}

FFMpegCore/FFMpeg/Arguments/AudioCodecArgument.cs

@@ -1,8 +1,8 @@
 using FFMpegCore.Enums;
 using FFMpegCore.Exceptions;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents parameter of audio codec and it's quality
     /// </summary>
@@ -25,5 +25,6 @@ public class AudioCodecArgument : IArgument
             AudioCodec = audioCodec;
         }
 
-    public string Text => $"-c:a {AudioCodec.ToLowerInvariant()}";
+        public string Text => $"-c:a {AudioCodec.ToString().ToLowerInvariant()}";
+    }
 }

FFMpegCore/FFMpeg/Arguments/AudioFiltersArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Exceptions;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class AudioFiltersArgument : IArgument
     {
         public readonly AudioFilterOptions Options;
@@ -42,52 +42,25 @@ public class AudioFilterOptions
     {
         public List<IAudioFilterArgument> Arguments { get; } = new();
 
-    public AudioFilterOptions Pan(string channelLayout, params string[] outputDefinitions)
-    {
-        return WithArgument(new PanArgument(channelLayout, outputDefinitions));
-    }
-
-    public AudioFilterOptions Pan(int channels, params string[] outputDefinitions)
-    {
-        return WithArgument(new PanArgument(channels, outputDefinitions));
-    }
-
+        public AudioFilterOptions Pan(string channelLayout, params string[] outputDefinitions) => WithArgument(new PanArgument(channelLayout, outputDefinitions));
+        public AudioFilterOptions Pan(int channels, params string[] outputDefinitions) => WithArgument(new PanArgument(channels, outputDefinitions));
         public AudioFilterOptions DynamicNormalizer(int frameLength = 500, int filterWindow = 31, double targetPeak = 0.95,
             double gainFactor = 10.0, double targetRms = 0.0, bool channelCoupling = true,
             bool enableDcBiasCorrection = false, bool enableAlternativeBoundary = false,
-        double compressorFactor = 0.0)
-    {
-        return WithArgument(new DynamicNormalizerArgument(frameLength, filterWindow,
+            double compressorFactor = 0.0) => WithArgument(new DynamicNormalizerArgument(frameLength, filterWindow,
             targetPeak, gainFactor, targetRms, channelCoupling, enableDcBiasCorrection, enableAlternativeBoundary,
             compressorFactor));
-    }
-
         public AudioFilterOptions HighPass(double frequency = 3000, int poles = 2, string width_type = "q", double width = 0.707,
             double mix = 1, string channels = "", bool normalize = false, string transform = "", string precision = "auto",
-        int? blocksize = null)
-    {
-        return WithArgument(new HighPassFilterArgument(frequency, poles, width_type, width, mix, channels, normalize, transform, precision, blocksize));
-    }
-
+            int? blocksize = null) => WithArgument(new HighPassFilterArgument(frequency, poles, width_type, width, mix, channels, normalize, transform, precision, blocksize));
         public AudioFilterOptions LowPass(double frequency = 3000, int poles = 2, string width_type = "q", double width = 0.707,
             double mix = 1, string channels = "", bool normalize = false, string transform = "", string precision = "auto",
-        int? blocksize = null)
-    {
-        return WithArgument(new LowPassFilterArgument(frequency, poles, width_type, width, mix, channels, normalize, transform, precision, blocksize));
-    }
-
+            int? blocksize = null) => WithArgument(new LowPassFilterArgument(frequency, poles, width_type, width, mix, channels, normalize, transform, precision, blocksize));
         public AudioFilterOptions AudioGate(double level_in = 1, string mode = "downward", double range = 0.06125, double threshold = 0.125,
             int ratio = 2, double attack = 20, double release = 250, int makeup = 1, double knee = 2.828427125, string detection = "rms",
-        string link = "average")
-    {
-        return WithArgument(new AudioGateArgument(level_in, mode, range, threshold, ratio, attack, release, makeup, knee, detection, link));
-    }
-
+            string link = "average") => WithArgument(new AudioGateArgument(level_in, mode, range, threshold, ratio, attack, release, makeup, knee, detection, link));
         public AudioFilterOptions SilenceDetect(string noise_type = "db", double noise = 60, double duration = 2,
-        bool mono = false)
-    {
-        return WithArgument(new SilenceDetectArgument(noise_type, noise, duration, mono));
-    }
+            bool mono = false) => WithArgument(new SilenceDetectArgument(noise_type, noise, duration, mono));
 
         private AudioFilterOptions WithArgument(IAudioFilterArgument argument)
         {
@@ -95,3 +68,4 @@ public class AudioFilterOptions
             return this;
         }
     }
+}

FFMpegCore/FFMpeg/Arguments/AudioGateArgument.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class AudioGateArgument : IAudioFilterArgument
     {
         private readonly Dictionary<string, string> _arguments = new();
@@ -10,34 +10,16 @@ public class AudioGateArgument : IAudioFilterArgument
         ///     Audio Gate. <see href="https://ffmpeg.org/ffmpeg-filters.html#agate"/>
         /// </summary>
         /// <param name="levelIn">Set input level before filtering. Default is 1. Allowed range is from 0.015625 to 64.</param>
-    /// <param name="mode">
-    ///     Set the mode of operation. Can be upward or downward. Default is downward. If set to upward mode, higher parts of signal
-    ///     will be amplified, expanding dynamic range in upward direction. Otherwise, in case of downward lower parts of signal will be reduced.
-    /// </param>
-    /// <param name="range">
-    ///     Set the level of gain reduction when the signal is below the threshold. Default is 0.06125. Allowed range is from 0 to
-    ///     1. Setting this to 0 disables reduction and then filter behaves like expander.
-    /// </param>
+        /// <param name="mode">Set the mode of operation. Can be upward or downward. Default is downward. If set to upward mode, higher parts of signal will be amplified, expanding dynamic range in upward direction. Otherwise, in case of downward lower parts of signal will be reduced.</param>
+        /// <param name="range">Set the level of gain reduction when the signal is below the threshold. Default is 0.06125. Allowed range is from 0 to 1. Setting this to 0 disables reduction and then filter behaves like expander.</param>
         /// <param name="threshold">If a signal rises above this level the gain reduction is released. Default is 0.125. Allowed range is from 0 to 1.</param>
         /// <param name="ratio">Set a ratio by which the signal is reduced. Default is 2. Allowed range is from 1 to 9000.</param>
-    /// <param name="attack">
-    ///     Amount of milliseconds the signal has to rise above the threshold before gain reduction stops. Default is 20
-    ///     milliseconds. Allowed range is from 0.01 to 9000.
-    /// </param>
-    /// <param name="release">
-    ///     Amount of milliseconds the signal has to fall below the threshold before the reduction is increased again. Default is
-    ///     250 milliseconds. Allowed range is from 0.01 to 9000.
-    /// </param>
+        /// <param name="attack">Amount of milliseconds the signal has to rise above the threshold before gain reduction stops. Default is 20 milliseconds. Allowed range is from 0.01 to 9000.</param>
+        /// <param name="release">Amount of milliseconds the signal has to fall below the threshold before the reduction is increased again. Default is 250 milliseconds. Allowed range is from 0.01 to 9000.</param>
         /// <param name="makeup">Set amount of amplification of signal after processing. Default is 1. Allowed range is from 1 to 64.</param>
-    /// <param name="knee">
-    ///     Curve the sharp knee around the threshold to enter gain reduction more softly. Default is 2.828427125. Allowed range is
-    ///     from 1 to 8.
-    /// </param>
+        /// <param name="knee">Curve the sharp knee around the threshold to enter gain reduction more softly. Default is 2.828427125. Allowed range is from 1 to 8.</param>
         /// <param name="detection">Choose if exact signal should be taken for detection or an RMS like one. Default is rms. Can be peak or rms.</param>
-    /// <param name="link">
-    ///     Choose if the average level between all channels or the louder channel affects the reduction. Default is average. Can be
-    ///     average or maximum.
-    /// </param>
+        /// <param name="link">Choose if the average level between all channels or the louder channel affects the reduction. Default is average. Can be average or maximum.</param>
         public AudioGateArgument(double levelIn = 1, string mode = "downward", double range = 0.06125, double threshold = 0.125, int ratio = 2,
             double attack = 20, double release = 250, int makeup = 1, double knee = 2.828427125, string detection = "rms", string link = "average")
         {
@@ -113,3 +95,4 @@ public class AudioGateArgument : IAudioFilterArgument
 
         public string Value => string.Join(":", _arguments.Select(pair => $"{pair.Key}={pair.Value}"));
     }
+}

FFMpegCore/FFMpeg/Arguments/AudioSamplingRateArgument.cs

@@ -1,12 +1,11 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Audio sampling rate argument. Defaults to 48000 (Hz)
     /// </summary>
     public class AudioSamplingRateArgument : IArgument
     {
         public readonly int SamplingRate;
-
         public AudioSamplingRateArgument(int samplingRate = 48000)
         {
             SamplingRate = samplingRate;
@@ -14,3 +13,4 @@ public class AudioSamplingRateArgument : IArgument
 
         public string Text => $"-ar {SamplingRate}";
     }
+}

FFMpegCore/FFMpeg/Arguments/BitStreamFilterArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents parameter of bitstream filter
     /// </summary>
@@ -23,3 +23,4 @@ public class BitStreamFilterArgument : IArgument
             _ => string.Empty
         };
     }
+}

FFMpegCore/FFMpeg/Arguments/BlackDetectArgument.cs

@@ -1,13 +1,14 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class BlackDetectArgument : IVideoFilterArgument
     {
+        public string Key => "blackdetect";
+
+        public string Value { get; }
+
         public BlackDetectArgument(double minimumDuration = 2.0, double pictureBlackRatioThreshold = 0.98, double pixelBlackThreshold = 0.1)
         {
             Value = $"d={minimumDuration}:pic_th={pictureBlackRatioThreshold}:pix_th={pixelBlackThreshold}";
         }
-
-    public string Key => "blackdetect";
-
-    public string Value { get; }
+    }
 }

FFMpegCore/FFMpeg/Arguments/BlackFrameArgument.cs

@@ -1,13 +1,14 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     internal class BlackFrameArgument : IVideoFilterArgument
     {
+        public string Key => "blackframe";
+
+        public string Value { get; }
+
         public BlackFrameArgument(int amount = 98, int threshold = 32)
         {
             Value = $"amount={amount}:threshold={threshold}";
         }
-
-    public string Key => "blackframe";
-
-    public string Value { get; }
+    }
 }

FFMpegCore/FFMpeg/Arguments/ConcatArgument.cs

@@ -1,4 +1,5 @@
-namespace FFMpegCore.Arguments;
+namespace FFMpegCore.Arguments
+{
 
     /// <summary>
     /// Represents parameter of concat argument
@@ -7,20 +8,15 @@
     public class ConcatArgument : IInputArgument
     {
         public readonly IEnumerable<string> Values;
-
         public ConcatArgument(IEnumerable<string> values)
         {
             Values = values;
         }
 
         public void Pre() { }
-
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
-
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
         public void Post() { }
 
         public string Text => $"-i \"concat:{string.Join(@"|", Values)}\"";
     }
+}

FFMpegCore/FFMpeg/Arguments/ConstantRateFactorArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Constant Rate Factor (CRF) argument
     /// </summary>
@@ -19,3 +19,4 @@ public class ConstantRateFactorArgument : IArgument
 
         public string Text => $"-crf {Crf}";
     }
+}

FFMpegCore/FFMpeg/Arguments/CopyArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents parameter of copy parameter
     /// Defines if channel (audio, video or both) should be copied to output file
@@ -9,7 +9,6 @@ namespace FFMpegCore.Arguments;
     public class CopyArgument : IArgument
     {
         public readonly Channel Channel;
-
         public CopyArgument(Channel channel = Channel.Both)
         {
             Channel = channel;
@@ -21,3 +20,4 @@ public class CopyArgument : IArgument
             _ => $"-c{Channel.StreamType()} copy"
         };
     }
+}

FFMpegCore/FFMpeg/Arguments/CopyCodecArgument.cs

@@ -1,9 +1,10 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents a copy codec parameter
     /// </summary>
     public class CopyCodecArgument : IArgument
     {
-    public string Text => "-codec copy";
+        public string Text => $"-codec copy";
+    }
 }

FFMpegCore/FFMpeg/Arguments/CropArgument.cs

@@ -1,12 +1,12 @@
 using System.Drawing;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class CropArgument : IArgument
     {
-    public readonly int Left;
         public readonly Size? Size;
         public readonly int Top;
+        public readonly int Left;
 
         public CropArgument(Size? size, int top, int left)
         {
@@ -19,3 +19,4 @@ public class CropArgument : IArgument
 
         public string Text => Size == null ? string.Empty : $"-vf crop={Size.Value.Width}:{Size.Value.Height}:{Left}:{Top}";
     }
+}

FFMpegCore/FFMpeg/Arguments/CustomArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class CustomArgument : IArgument
     {
         public readonly string Argument;
@@ -11,3 +11,4 @@ public class CustomArgument : IArgument
 
         public string Text => Argument ?? string.Empty;
     }
+}

FFMpegCore/FFMpeg/Arguments/DemuxConcatArgument.cs

@@ -1,44 +1,31 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents parameter of concat argument
     /// Used for creating video from multiple images or videos
     /// </summary>
     public class DemuxConcatArgument : IInputArgument
     {
-    private readonly string _tempFileName = Path.Combine(GlobalFFOptions.Current.TemporaryFilesFolder, $"concat_{Guid.NewGuid()}.txt");
         public readonly IEnumerable<string> Values;
-
         public DemuxConcatArgument(IEnumerable<string> values)
         {
             Values = values.Select(value => $"file '{Escape(value)}'");
         }
 
-    public void Pre()
-    {
-        File.WriteAllLines(_tempFileName, Values);
-    }
-
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
-
-    public void Post()
-    {
-        File.Delete(_tempFileName);
-    }
-
-    public string Text => $"-f concat -safe 0 -i \"{_tempFileName}\"";
-
         /// <summary>
         /// Thanks slhck
         /// https://superuser.com/a/787651/1089628
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-    private string Escape(string value)
-    {
-        return value.Replace("'", @"'\''");
+        private string Escape(string value) => value.Replace("'", @"'\''");
+
+        private readonly string _tempFileName = Path.Combine(GlobalFFOptions.Current.TemporaryFilesFolder, $"concat_{Guid.NewGuid()}.txt");
+
+        public void Pre() => File.WriteAllLines(_tempFileName, Values);
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
+        public void Post() => File.Delete(_tempFileName);
+
+        public string Text => $"-f concat -safe 0 -i \"{_tempFileName}\"";
     }
 }

FFMpegCore/FFMpeg/Arguments/DisableChannelArgument.cs

@@ -1,8 +1,8 @@
 using FFMpegCore.Enums;
 using FFMpegCore.Exceptions;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents cpu speed parameter
     /// </summary>
@@ -27,3 +27,4 @@ public class DisableChannelArgument : IArgument
             _ => string.Empty
         };
     }
+}

FFMpegCore/FFMpeg/Arguments/DrawTextArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Drawtext video filter argument
     /// </summary>
@@ -18,29 +18,21 @@ public class DrawTextArgument : IVideoFilterArgument
 
     public class DrawTextOptions
     {
+        public readonly string Text;
         public readonly string Font;
         public readonly List<(string key, string value)> Parameters;
-    public readonly string Text;
-
-    private DrawTextOptions(string text, string font, IEnumerable<(string, string)> parameters)
-    {
-        Text = text;
-        Font = font;
-        Parameters = parameters.ToList();
-    }
-
-    internal string TextInternal => string.Join(":", new[] { ("text", Text), ("fontfile", Font) }.Concat(Parameters).Select(FormatArgumentPair));
 
         public static DrawTextOptions Create(string text, string font)
         {
             return new DrawTextOptions(text, font, new List<(string, string)>());
         }
-
         public static DrawTextOptions Create(string text, string font, params (string key, string value)[] parameters)
         {
             return new DrawTextOptions(text, font, parameters);
         }
 
+        internal string TextInternal => string.Join(":", new[] { ("text", Text), ("fontfile", Font) }.Concat(Parameters).Select(FormatArgumentPair));
+
         private static string FormatArgumentPair((string key, string value) pair)
         {
             return $"{pair.key}={EncloseIfContainsSpace(pair.value)}";
@@ -51,9 +43,17 @@ public class DrawTextOptions
             return input.Contains(" ") ? $"'{input}'" : input;
         }
 
+        private DrawTextOptions(string text, string font, IEnumerable<(string, string)> parameters)
+        {
+            Text = text;
+            Font = font;
+            Parameters = parameters.ToList();
+        }
+
         public DrawTextOptions WithParameter(string key, string value)
         {
             Parameters.Add((key, value));
             return this;
         }
     }
+}

FFMpegCore/FFMpeg/Arguments/DurationArgument.cs

@@ -1,12 +1,11 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents duration parameter
     /// </summary>
     public class DurationArgument : IArgument
     {
         public readonly TimeSpan? Duration;
-
         public DurationArgument(TimeSpan? duration)
         {
             Duration = duration;
@@ -14,3 +13,4 @@ public class DurationArgument : IArgument
 
         public string Text => !Duration.HasValue ? string.Empty : $"-t {Duration.Value}";
     }
+}

FFMpegCore/FFMpeg/Arguments/DynamicNormalizerArgument.cs

@@ -1,7 +1,7 @@
 using System.Globalization;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class DynamicNormalizerArgument : IAudioFilterArgument
     {
         private readonly Dictionary<string, string> _arguments = new();
@@ -18,8 +18,7 @@ public class DynamicNormalizerArgument : IAudioFilterArgument
         /// <param name="enableDcBiasCorrection">Enable DC bias correction. By default is disabled.</param>
         /// <param name="enableAlternativeBoundary">Enable alternative boundary mode. By default is disabled.</param>
         /// <param name="compressorFactor">Set the compress factor. In range from 0.0 to 30.0. Default is 0.0 (disabled).</param>
-    public DynamicNormalizerArgument(int frameLength = 500, int filterWindow = 31, double targetPeak = 0.95, double gainFactor = 10.0, double targetRms = 0.0,
-        bool channelCoupling = true, bool enableDcBiasCorrection = false, bool enableAlternativeBoundary = false, double compressorFactor = 0.0)
+        public DynamicNormalizerArgument(int frameLength = 500, int filterWindow = 31, double targetPeak = 0.95, double gainFactor = 10.0, double targetRms = 0.0, bool channelCoupling = true, bool enableDcBiasCorrection = false, bool enableAlternativeBoundary = false, double compressorFactor = 0.0)
         {
             if (frameLength < 10 || frameLength > 8000)
             {
@@ -71,3 +70,4 @@ public class DynamicNormalizerArgument : IAudioFilterArgument
 
         public string Value => string.Join(":", _arguments.Select(pair => $"{pair.Key}={pair.Value}"));
     }
+}

FFMpegCore/FFMpeg/Arguments/EndSeekArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Extend;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents seek parameter
     /// </summary>
@@ -16,3 +16,4 @@ public class EndSeekArgument : IArgument
 
         public string Text => SeekTo.HasValue ? $"-to {SeekTo.Value.ToLongString()}" : string.Empty;
     }
+}

FFMpegCore/FFMpeg/Arguments/FaststartArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Faststart argument - for moving moov atom to the start of file
     /// </summary>
@@ -7,3 +7,4 @@ public class FaststartArgument : IArgument
     {
         public string Text => "-movflags faststart";
     }
+}

FFMpegCore/FFMpeg/Arguments/ForceFormatArgument.cs

@@ -1,14 +1,13 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents force format parameter
     /// </summary>
     public class ForceFormatArgument : IArgument
     {
         private readonly string _format;
-
         public ForceFormatArgument(string format)
         {
             _format = format;
@@ -21,3 +20,4 @@ public class ForceFormatArgument : IArgument
 
         public string Text => $"-f {_format}";
     }
+}

FFMpegCore/FFMpeg/Arguments/ForcePixelFormat.cs

@@ -1,15 +1,17 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class ForcePixelFormat : IArgument
     {
+        public string PixelFormat { get; }
+        public string Text => $"-pix_fmt {PixelFormat}";
+
         public ForcePixelFormat(string format)
         {
             PixelFormat = format;
         }
 
         public ForcePixelFormat(PixelFormat format) : this(format.Name) { }
-    public string PixelFormat { get; }
-    public string Text => $"-pix_fmt {PixelFormat}";
+    }
 }

FFMpegCore/FFMpeg/Arguments/FrameOutputCountArgument.cs

@@ -1,12 +1,11 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents frame output count parameter
     /// </summary>
     public class FrameOutputCountArgument : IArgument
     {
         public readonly int Frames;
-
         public FrameOutputCountArgument(int frames)
         {
             Frames = frames;
@@ -14,3 +13,4 @@ public class FrameOutputCountArgument : IArgument
 
         public string Text => $"-vframes {Frames}";
     }
+}

FFMpegCore/FFMpeg/Arguments/FrameRateArgument.cs

@@ -1,7 +1,5 @@
-using System.Globalization;
-
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents frame rate parameter
     /// </summary>
@@ -14,5 +12,6 @@ public class FrameRateArgument : IArgument
             Framerate = framerate;
         }
 
-    public string Text => $"-r {Framerate.ToString(CultureInfo.InvariantCulture)}";
+        public string Text => $"-r {Framerate.ToString(System.Globalization.CultureInfo.InvariantCulture)}";
+    }
 }

FFMpegCore/FFMpeg/Arguments/GifPaletteArgument.cs

@@ -1,13 +1,14 @@
 using System.Drawing;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class GifPaletteArgument : IArgument
     {
+        private readonly int _streamIndex;
+
         private readonly int _fps;
 
         private readonly Size? _size;
-    private readonly int _streamIndex;
 
         public GifPaletteArgument(int streamIndex, int fps, Size? size)
         {
@@ -18,6 +19,6 @@ public class GifPaletteArgument : IArgument
 
         private string ScaleText => _size.HasValue ? $"scale=w={_size.Value.Width}:h={_size.Value.Height}," : string.Empty;
 
-    public string Text =>
-        $"-filter_complex \"[{_streamIndex}:v] fps={_fps},{ScaleText}split [a][b];[a] palettegen=max_colors=32 [p];[b][p] paletteuse=dither=bayer\"";
+        public string Text => $"-filter_complex \"[{_streamIndex}:v] fps={_fps},{ScaleText}split [a][b];[a] palettegen=max_colors=32 [p];[b][p] paletteuse=dither=bayer\"";
+    }
 }

FFMpegCore/FFMpeg/Arguments/HardwareAccelerationArgument.cs

@@ -1,15 +1,16 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class HardwareAccelerationArgument : IArgument
     {
+        public HardwareAccelerationDevice HardwareAccelerationDevice { get; }
+
         public HardwareAccelerationArgument(HardwareAccelerationDevice hardwareAccelerationDevice)
         {
             HardwareAccelerationDevice = hardwareAccelerationDevice;
         }
 
-    public HardwareAccelerationDevice HardwareAccelerationDevice { get; }
-
         public string Text => $"-hwaccel {HardwareAccelerationDevice.ToString().ToLower()}";
     }
+}

FFMpegCore/FFMpeg/Arguments/HighPassFilterArgument.cs

@@ -1,62 +1,27 @@
 using System.Globalization;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class HighPassFilterArgument : IAudioFilterArgument
     {
         private readonly Dictionary<string, string> _arguments = new();
-
-    private readonly List<string> _precision = new()
-    {
-        "auto",
-        "s16",
-        "s32",
-        "f32",
-        "f64"
-    };
-
-    private readonly List<string> _transformTypes = new()
-    {
-        "di",
-        "dii",
-        "tdi",
-        "tdii",
-        "latt",
-        "svf",
-        "zdf"
-    };
-
-    private readonly List<string> _widthTypes = new()
-    {
-        "h",
-        "q",
-        "o",
-        "s",
-        "k"
-    };
-
+        private readonly List<string> _widthTypes = new() { "h", "q", "o", "s", "k" };
+        private readonly List<string> _transformTypes = new() { "di", "dii", "tdi", "tdii", "latt", "svf", "zdf" };
+        private readonly List<string> _precision = new() { "auto", "s16", "s32", "f32", "f64" };
         /// <summary>
         ///     HighPass Filter. <see href="https://ffmpeg.org/ffmpeg-filters.html#highpass"/>
         /// </summary>
         /// <param name="frequency">Set frequency in Hz. Default is 3000.</param>
         /// <param name="poles">Set number of poles. Default is 2.</param>
         /// <param name="width_type">Set method to specify band-width of filter, possible values are: h, q, o, s, k</param>
-    /// <param name="width">
-    ///     Specify the band-width of a filter in width_type units. Applies only to double-pole filter. The default is 0.707q and
-    ///     gives a Butterworth response.
-    /// </param>
+        /// <param name="width">Specify the band-width of a filter in width_type units. Applies only to double-pole filter. The default is 0.707q and gives a Butterworth response.</param>
         /// <param name="mix">How much to use filtered signal in output. Default is 1. Range is between 0 and 1.</param>
         /// <param name="channels">Specify which channels to filter, by default all available are filtered.</param>
         /// <param name="normalize">Normalize biquad coefficients, by default is disabled. Enabling it will normalize magnitude response at DC to 0dB.</param>
         /// <param name="transform">Set transform type of IIR filter, possible values are: di, dii, tdi, tdii, latt, svf, zdf</param>
         /// <param name="precision">Set precison of filtering, possible values are: auto, s16, s32, f32, f64.</param>
-    /// <param name="block_size">
-    ///     Set block size used for reverse IIR processing. If this value is set to high enough value (higher than impulse
-    ///     response length truncated when reaches near zero values) filtering will become linear phase otherwise if not big enough it will just
-    ///     produce nasty artifacts.
-    /// </param>
-    public HighPassFilterArgument(double frequency = 3000, int poles = 2, string width_type = "q", double width = 0.707, double mix = 1, string channels = "",
-        bool normalize = false, string transform = "", string precision = "auto", int? block_size = null)
+        /// <param name="block_size">Set block size used for reverse IIR processing. If this value is set to high enough value (higher than impulse response length truncated when reaches near zero values) filtering will become linear phase otherwise if not big enough it will just produce nasty artifacts.</param>
+        public HighPassFilterArgument(double frequency = 3000, int poles = 2, string width_type = "q", double width = 0.707, double mix = 1, string channels = "", bool normalize = false, string transform = "", string precision = "auto", int? block_size = null)
         {
             if (frequency < 0)
             {
@@ -70,7 +35,7 @@ public class HighPassFilterArgument : IAudioFilterArgument
 
             if (!_widthTypes.Contains(width_type))
             {
-            throw new ArgumentOutOfRangeException(nameof(width_type), "Width type must be either " + _widthTypes);
+                throw new ArgumentOutOfRangeException(nameof(width_type), "Width type must be either " + _widthTypes.ToString());
             }
 
             if (mix < 0 || mix > 1)
@@ -80,7 +45,7 @@ public class HighPassFilterArgument : IAudioFilterArgument
 
             if (!_precision.Contains(precision))
             {
-            throw new ArgumentOutOfRangeException(nameof(precision), "Precision must be either " + _precision);
+                throw new ArgumentOutOfRangeException(nameof(precision), "Precision must be either " + _precision.ToString());
             }
 
             _arguments.Add("f", frequency.ToString("0.00", CultureInfo.InvariantCulture));
@@ -110,3 +75,4 @@ public class HighPassFilterArgument : IAudioFilterArgument
 
         public string Value => string.Join(":", _arguments.Select(pair => $"{pair.Key}={pair.Value}"));
     }
+}

FFMpegCore/FFMpeg/Arguments/IArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public interface IArgument
     {
         /// <summary>
@@ -7,3 +7,4 @@ public interface IArgument
         /// </summary>
         string Text { get; }
     }
+}

FFMpegCore/FFMpeg/Arguments/ID3V2VersionArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class ID3V2VersionArgument : IArgument
     {
         private readonly int _version;
@@ -11,3 +11,4 @@ public class ID3V2VersionArgument : IArgument
 
         public string Text => $"-id3v2_version {_version}";
     }
+}

FFMpegCore/FFMpeg/Arguments/IDynamicArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public interface IDynamicArgument
     {
         /// <summary>
@@ -8,5 +8,6 @@ public interface IDynamicArgument
         /// <param name="context"></param>
         /// <returns></returns>
         //public string GetText(StringBuilder context);
-    string GetText(IEnumerable<IArgument> context);
+        public string GetText(IEnumerable<IArgument> context);
+    }
 }

FFMpegCore/FFMpeg/Arguments/IInputArgument.cs

@@ -1,5 +1,6 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public interface IInputArgument : IInputOutputArgument
     {
     }
+}

FFMpegCore/FFMpeg/Arguments/IInputOutputArgument.cs

@@ -1,8 +1,9 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public interface IInputOutputArgument : IArgument
     {
         void Pre();
         Task During(CancellationToken cancellationToken = default);
         void Post();
     }
+}

FFMpegCore/FFMpeg/Arguments/IOutputArgument.cs

@@ -1,5 +1,6 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public interface IOutputArgument : IInputOutputArgument
     {
     }
+}

FFMpegCore/FFMpeg/Arguments/InputArgument.cs

@@ -1,12 +1,12 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents input parameter
     /// </summary>
     public class InputArgument : IInputArgument
     {
-    public readonly string FilePath;
         public readonly bool VerifyExists;
+        public readonly string FilePath;
 
         public InputArgument(bool verifyExists, string filePaths)
         {
@@ -24,12 +24,9 @@ public class InputArgument : IInputArgument
             }
         }
 
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
-
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
         public void Post() { }
 
         public string Text => $"-i \"{FilePath}\"";
     }
+}

FFMpegCore/FFMpeg/Arguments/InputDeviceArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents an input device parameter
     /// </summary>
@@ -12,10 +12,7 @@ public class InputDeviceArgument : IInputArgument
             Device = device;
         }
 
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
 
         public void Pre() { }
 
@@ -23,3 +20,4 @@ public class InputDeviceArgument : IInputArgument
 
         public string Text => $"-i {Device}";
     }
+}

FFMpegCore/FFMpeg/Arguments/InputPipeArgument.cs

@@ -1,8 +1,8 @@
 using System.IO.Pipes;
 using FFMpegCore.Pipes;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents input parameter for a named pipe
     /// </summary>
@@ -28,3 +28,4 @@ public class InputPipeArgument : PipeArgument, IInputArgument
             await Writer.WriteAsync(Pipe, token).ConfigureAwait(false);
         }
     }
+}

FFMpegCore/FFMpeg/Arguments/LoopArgument.cs

@@ -1,12 +1,11 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents loop parameter
     /// </summary>
     public class LoopArgument : IArgument
     {
         public readonly int Times;
-
         public LoopArgument(int times)
         {
             Times = times;
@@ -14,3 +13,4 @@ public class LoopArgument : IArgument
 
         public string Text => $"-loop {Times}";
     }
+}

FFMpegCore/FFMpeg/Arguments/LowPassFilterArgument.cs

@@ -1,62 +1,27 @@
 using System.Globalization;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class LowPassFilterArgument : IAudioFilterArgument
     {
         private readonly Dictionary<string, string> _arguments = new();
-
-    private readonly List<string> _precision = new()
-    {
-        "auto",
-        "s16",
-        "s32",
-        "f32",
-        "f64"
-    };
-
-    private readonly List<string> _transformTypes = new()
-    {
-        "di",
-        "dii",
-        "tdi",
-        "tdii",
-        "latt",
-        "svf",
-        "zdf"
-    };
-
-    private readonly List<string> _widthTypes = new()
-    {
-        "h",
-        "q",
-        "o",
-        "s",
-        "k"
-    };
-
+        private readonly List<string> _widthTypes = new() { "h", "q", "o", "s", "k" };
+        private readonly List<string> _transformTypes = new() { "di", "dii", "tdi", "tdii", "latt", "svf", "zdf" };
+        private readonly List<string> _precision = new() { "auto", "s16", "s32", "f32", "f64" };
         /// <summary>
         ///     LowPass Filter. <see href="https://ffmpeg.org/ffmpeg-filters.html#lowpass"/>
         /// </summary>
         /// <param name="frequency">Set frequency in Hz. Default is 3000.</param>
         /// <param name="poles">Set number of poles. Default is 2.</param>
         /// <param name="width_type">Set method to specify band-width of filter, possible values are: h, q, o, s, k</param>
-    /// <param name="width">
-    ///     Specify the band-width of a filter in width_type units. Applies only to double-pole filter. The default is 0.707q and
-    ///     gives a Butterworth response.
-    /// </param>
+        /// <param name="width">Specify the band-width of a filter in width_type units. Applies only to double-pole filter. The default is 0.707q and gives a Butterworth response.</param>
         /// <param name="mix">How much to use filtered signal in output. Default is 1. Range is between 0 and 1.</param>
         /// <param name="channels">Specify which channels to filter, by default all available are filtered.</param>
         /// <param name="normalize">Normalize biquad coefficients, by default is disabled. Enabling it will normalize magnitude response at DC to 0dB.</param>
         /// <param name="transform">Set transform type of IIR filter, possible values are: di, dii, tdi, tdii, latt, svf, zdf</param>
         /// <param name="precision">Set precison of filtering, possible values are: auto, s16, s32, f32, f64.</param>
-    /// <param name="block_size">
-    ///     Set block size used for reverse IIR processing. If this value is set to high enough value (higher than impulse
-    ///     response length truncated when reaches near zero values) filtering will become linear phase otherwise if not big enough it will just
-    ///     produce nasty artifacts.
-    /// </param>
-    public LowPassFilterArgument(double frequency = 3000, int poles = 2, string width_type = "q", double width = 0.707, double mix = 1, string channels = "",
-        bool normalize = false, string transform = "", string precision = "auto", int? block_size = null)
+        /// <param name="block_size">Set block size used for reverse IIR processing. If this value is set to high enough value (higher than impulse response length truncated when reaches near zero values) filtering will become linear phase otherwise if not big enough it will just produce nasty artifacts.</param>
+        public LowPassFilterArgument(double frequency = 3000, int poles = 2, string width_type = "q", double width = 0.707, double mix = 1, string channels = "", bool normalize = false, string transform = "", string precision = "auto", int? block_size = null)
         {
             if (frequency < 0)
             {
@@ -70,7 +35,7 @@ public class LowPassFilterArgument : IAudioFilterArgument
 
             if (!_widthTypes.Contains(width_type))
             {
-            throw new ArgumentOutOfRangeException(nameof(width_type), "Width type must be either " + _widthTypes);
+                throw new ArgumentOutOfRangeException(nameof(width_type), "Width type must be either " + _widthTypes.ToString());
             }
 
             if (mix < 0 || mix > 1)
@@ -80,7 +45,7 @@ public class LowPassFilterArgument : IAudioFilterArgument
 
             if (!_precision.Contains(precision))
             {
-            throw new ArgumentOutOfRangeException(nameof(precision), "Precision must be either " + _precision);
+                throw new ArgumentOutOfRangeException(nameof(precision), "Precision must be either " + _precision.ToString());
             }
 
             _arguments.Add("f", frequency.ToString("0.00", CultureInfo.InvariantCulture));
@@ -110,3 +75,4 @@ public class LowPassFilterArgument : IAudioFilterArgument
 
         public string Value => string.Join(":", _arguments.Select(pair => $"{pair.Key}={pair.Value}"));
     }
+}

FFMpegCore/FFMpeg/Arguments/MapMetadataArgument.cs

@@ -1,9 +1,11 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class MapMetadataArgument : IInputArgument, IDynamicArgument
     {
         private readonly int? _inputIndex;
 
+        public string Text => GetText(null);
+
         /// <summary>
         /// Null means it takes the last input used before this argument
         /// </summary>
@@ -35,8 +37,6 @@ public class MapMetadataArgument : IInputArgument, IDynamicArgument
             return $"-map_metadata {index}";
         }
 
-    public string Text => GetText(null);
-
         public Task During(CancellationToken cancellationToken = default)
         {
             return Task.CompletedTask;
@@ -50,3 +50,4 @@ public class MapMetadataArgument : IInputArgument, IDynamicArgument
         {
         }
     }
+}

FFMpegCore/FFMpeg/Arguments/MapStreamArgument.cs

@@ -1,16 +1,16 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents choice of stream by the stream specifier 
     /// </summary>
     public class MapStreamArgument : IArgument
     {
-    private readonly Channel _channel;
         private readonly int _inputFileIndex;
-    private readonly bool _negativeMap;
         private readonly int _streamIndex;
+        private readonly Channel _channel;
+        private readonly bool _negativeMap;
 
         public MapStreamArgument(int streamIndex, int inputFileIndex, Channel channel = Channel.All, bool negativeMap = false)
         {
@@ -28,3 +28,4 @@ public class MapStreamArgument : IArgument
 
         public string Text => $"-map {(_negativeMap ? "-" : "")}{_inputFileIndex}{_channel.StreamType()}:{_streamIndex}";
     }
+}

FFMpegCore/FFMpeg/Arguments/MetaDataArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class MetaDataArgument : IInputArgument, IDynamicArgument
     {
         private readonly string _metaDataContent;
@@ -10,6 +10,14 @@ public class MetaDataArgument : IInputArgument, IDynamicArgument
             _metaDataContent = metaDataContent;
         }
 
+        public string Text => GetText(null);
+
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
+
+        public void Pre() => File.WriteAllText(_tempFileName, _metaDataContent);
+
+        public void Post() => File.Delete(_tempFileName);
+
         public string GetText(IEnumerable<IArgument>? arguments)
         {
             arguments ??= Enumerable.Empty<IArgument>();
@@ -21,21 +29,5 @@ public class MetaDataArgument : IInputArgument, IDynamicArgument
 
             return $"-i \"{_tempFileName}\" -map_metadata {index}";
         }
-
-    public string Text => GetText(null);
-
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
-
-    public void Pre()
-    {
-        File.WriteAllText(_tempFileName, _metaDataContent);
-    }
-
-    public void Post()
-    {
-        File.Delete(_tempFileName);
     }
 }

FFMpegCore/FFMpeg/Arguments/MultiInputArgument.cs

@@ -1,12 +1,12 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents input parameters for multiple files
     /// </summary>
     public class MultiInputArgument : IInputArgument
     {
-    public readonly IEnumerable<string> FilePaths;
         public readonly bool VerifyExists;
+        public readonly IEnumerable<string> FilePaths;
 
         public MultiInputArgument(bool verifyExists, IEnumerable<string> filePaths)
         {
@@ -36,11 +36,7 @@ public class MultiInputArgument : IInputArgument
             }
         }
 
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
-
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
         public void Post() { }
 
         /// <summary>
@@ -48,3 +44,4 @@ public class MultiInputArgument : IInputArgument
         /// </summary>
         public string Text => string.Join(" ", FilePaths.Select(filePath => $"-i \"{filePath}\""));
     }
+}

FFMpegCore/FFMpeg/Arguments/OutputArgument.cs

@@ -1,14 +1,14 @@
 using FFMpegCore.Exceptions;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents output parameter
     /// </summary>
     public class OutputArgument : IOutputArgument
     {
-    public readonly bool Overwrite;
         public readonly string Path;
+        public readonly bool Overwrite;
 
         public OutputArgument(string path, bool overwrite = true)
         {
@@ -16,10 +16,6 @@ public class OutputArgument : IOutputArgument
             Overwrite = overwrite;
         }
 
-    public OutputArgument(FileInfo value) : this(value.FullName) { }
-
-    public OutputArgument(Uri value) : this(value.AbsolutePath) { }
-
         public void Pre()
         {
             if (!Overwrite && File.Exists(Path))
@@ -27,15 +23,15 @@ public class OutputArgument : IOutputArgument
                 throw new FFMpegException(FFMpegExceptionType.File, "Output file already exists and overwrite is disabled");
             }
         }
-
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
-
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
         public void Post()
         {
         }
 
+        public OutputArgument(FileInfo value) : this(value.FullName) { }
+
+        public OutputArgument(Uri value) : this(value.AbsolutePath) { }
+
         public string Text => $"\"{Path}\"{(Overwrite ? " -y" : string.Empty)}";
     }
+}

FFMpegCore/FFMpeg/Arguments/OutputPipeArgument.cs

@@ -1,8 +1,8 @@
 using System.IO.Pipes;
 using FFMpegCore.Pipes;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class OutputPipeArgument : PipeArgument, IOutputArgument
     {
         public readonly IPipeSink Reader;
@@ -25,3 +25,4 @@ public class OutputPipeArgument : PipeArgument, IOutputArgument
             await Reader.ReadAsync(Pipe, token).ConfigureAwait(false);
         }
     }
+}

FFMpegCore/FFMpeg/Arguments/OutputTeeArgument.cs

@@ -1,5 +1,6 @@
-namespace FFMpegCore.Arguments;
-
+
+namespace FFMpegCore.Arguments
+{
     internal class OutputTeeArgument : IOutputArgument
     {
         private readonly FFMpegMultiOutputOptions _options;
@@ -16,10 +17,7 @@ internal class OutputTeeArgument : IOutputArgument
 
         public string Text => $"-f tee \"{string.Join("|", _options.Outputs.Select(MapOptions))}\"";
 
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
 
         public void Post()
         {
@@ -48,8 +46,7 @@ internal class OutputTeeArgument : IOutputArgument
             {
                 return map.Text.Replace("-map ", "select=\\'") + "\\'";
             }
-
-        if (argument is BitStreamFilterArgument bitstreamFilter)
+            else if (argument is BitStreamFilterArgument bitstreamFilter)
             {
                 return bitstreamFilter.Text.Replace("-bsf:", "bsfs/").Replace(' ', '=');
             }
@@ -57,3 +54,4 @@ internal class OutputTeeArgument : IOutputArgument
             return argument.Text.TrimStart('-').Replace(' ', '=');
         }
     }
+}

FFMpegCore/FFMpeg/Arguments/OutputUrlArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents outputting to url using supported protocols
     /// See http://ffmpeg.org/ffmpeg-protocols.html
@@ -15,12 +15,10 @@ public class OutputUrlArgument : IOutputArgument
 
         public void Post() { }
 
-    public Task During(CancellationToken cancellationToken = default)
-    {
-        return Task.CompletedTask;
-    }
+        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
 
         public void Pre() { }
 
         public string Text => Url;
     }
+}

FFMpegCore/FFMpeg/Arguments/OverwriteArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents overwrite parameter
     /// If output file should be overwritten if exists
@@ -8,3 +8,4 @@ public class OverwriteArgument : IArgument
     {
         public string Text => "-y";
     }
+}

FFMpegCore/FFMpeg/Arguments/PadArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Extend;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class PadArgument : IVideoFilterArgument
     {
         private readonly PadOptions _options;
@@ -13,12 +13,31 @@ public class PadArgument : IVideoFilterArgument
 
         public string Key => "pad";
         public string Value => _options.TextInternal;
+
     }
 
     public class PadOptions
     {
         public readonly Dictionary<string, string> Parameters = new();
 
+        internal string TextInternal => string.Join(":", Parameters.Select(parameter => parameter.FormatArgumentPair(true)));
+
+        public static PadOptions Create(string? width, string? height)
+        {
+            return new PadOptions(width, height);
+        }
+
+        public static PadOptions Create(string aspectRatio)
+        {
+            return new PadOptions(aspectRatio);
+        }
+
+        public PadOptions WithParameter(string key, string value)
+        {
+            Parameters.Add(key, value);
+            return this;
+        }
+
         private PadOptions(string? width, string? height)
         {
             if (width == null && height == null)
@@ -41,22 +60,5 @@ public class PadOptions
         {
             Parameters.Add("aspect", aspectRatio);
         }
-
-    internal string TextInternal => string.Join(":", Parameters.Select(parameter => parameter.FormatArgumentPair(true)));
-
-    public static PadOptions Create(string? width, string? height)
-    {
-        return new PadOptions(width, height);
-    }
-
-    public static PadOptions Create(string aspectRatio)
-    {
-        return new PadOptions(aspectRatio);
-    }
-
-    public PadOptions WithParameter(string key, string value)
-    {
-        Parameters.Add(key, value);
-        return this;
     }
 }

FFMpegCore/FFMpeg/Arguments/PanArgument.cs

@@ -1,12 +1,12 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     ///     Mix channels with specific gain levels.
     /// </summary>
     public class PanArgument : IAudioFilterArgument
     {
-    private readonly string[] _outputDefinitions;
         public readonly string ChannelLayout;
+        private readonly string[] _outputDefinitions;
 
         /// <summary>
         ///     Mix channels with specific gain levels <see href="https://ffmpeg.org/ffmpeg-filters.html#toc-pan-1"/>
@@ -58,3 +58,4 @@ public class PanArgument : IAudioFilterArgument
         public string Value =>
             string.Join("|", Enumerable.Empty<string>().Append(ChannelLayout).Concat(_outputDefinitions));
     }
+}

FFMpegCore/FFMpeg/Arguments/PipeArgument.cs

@@ -2,12 +2,15 @@
 using System.IO.Pipes;
 using FFMpegCore.Pipes;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public abstract class PipeArgument
     {
+        private string PipeName { get; }
+        public string PipePath => PipeHelpers.GetPipePath(PipeName);
+
+        protected NamedPipeServerStream Pipe { get; private set; } = null!;
         private readonly PipeDirection _direction;
-    private readonly object _pipeLock = new();
 
         protected PipeArgument(PipeDirection direction)
         {
@@ -15,15 +18,7 @@ public abstract class PipeArgument
             _direction = direction;
         }
 
-    private string PipeName { get; }
-    public string PipePath => PipeHelpers.GetPipePath(PipeName);
-
-    protected NamedPipeServerStream Pipe { get; private set; } = null!;
-    public abstract string Text { get; }
-
         public void Pre()
-    {
-        lock (_pipeLock)
         {
             if (Pipe != null)
             {
@@ -32,13 +27,13 @@ public abstract class PipeArgument
 
             Pipe = new NamedPipeServerStream(PipeName, _direction, 1, PipeTransmissionMode.Byte, PipeOptions.Asynchronous);
         }
-    }
 
         public void Post()
         {
             Debug.WriteLine($"Disposing NamedPipeServerStream on {GetType().Name}");
-        lock (_pipeLock)
+            lock(Pipe)
             {
+
                 Pipe?.Dispose();
                 Pipe = null!;
             }
@@ -57,7 +52,10 @@ public abstract class PipeArgument
             finally
             {
                 Debug.WriteLine($"Disconnecting NamedPipeServerStream on {GetType().Name}");
-            lock (_pipeLock)
+                lock (Pipe ?? new object()) 
+                    //if Pipe is null, then the lock doesnt matter,
+                    //Because the next code will not execute anyways.
+                    //so we can use a new object
                 {
                     if (Pipe is { IsConnected: true })
                     {
@@ -68,4 +66,6 @@ public abstract class PipeArgument
         }
 
         protected abstract Task ProcessDataAsync(CancellationToken token);
+        public abstract string Text { get; }
+    }
 }

FFMpegCore/FFMpeg/Arguments/RemoveMetadataArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Remove metadata argument
     /// </summary>
@@ -7,3 +7,4 @@ public class RemoveMetadataArgument : IArgument
     {
         public string Text => "-map_metadata -1";
     }
+}

FFMpegCore/FFMpeg/Arguments/ScaleArgument.cs

@@ -1,15 +1,14 @@
 using System.Drawing;
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents scale parameter
     /// </summary>
     public class ScaleArgument : IVideoFilterArgument
     {
         public readonly Size? Size;
-
         public ScaleArgument(Size? size)
         {
             Size = size;
@@ -19,9 +18,10 @@ public class ScaleArgument : IVideoFilterArgument
 
         public ScaleArgument(VideoSize videosize)
         {
-        Size = videosize == VideoSize.Original ? null : new Size(-1, (int)videosize);
+            Size = videosize == VideoSize.Original ? null : (Size?)new Size(-1, (int)videosize);
         }
 
         public string Key { get; } = "scale";
         public string Value => Size == null ? string.Empty : $"{Size.Value.Width}:{Size.Value.Height}";
     }
+}

FFMpegCore/FFMpeg/Arguments/SeekArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Extend;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents seek parameter
     /// </summary>
@@ -16,3 +16,4 @@ public class SeekArgument : IArgument
 
         public string Text => SeekTo.HasValue ? $"-ss {SeekTo.Value.ToLongString()}" : string.Empty;
     }
+}

FFMpegCore/FFMpeg/Arguments/SetMirroringArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class SetMirroringArgument : IVideoFilterArgument
     {
         public SetMirroringArgument(Mirroring mirroring)
@@ -21,3 +21,4 @@ public class SetMirroringArgument : IVideoFilterArgument
                 _ => throw new ArgumentOutOfRangeException(nameof(Mirroring))
             };
     }
+}

FFMpegCore/FFMpeg/Arguments/ShortestArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents shortest parameter
     /// </summary>
@@ -14,3 +14,4 @@ public class ShortestArgument : IArgument
 
         public string Text => Shortest ? "-shortest" : string.Empty;
     }
+}

FFMpegCore/FFMpeg/Arguments/SilenceDetectArgument.cs

@@ -1,24 +1,18 @@
 using System.Globalization;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class SilenceDetectArgument : IAudioFilterArgument
     {
         private readonly Dictionary<string, string> _arguments = new();
-
         /// <summary>
         ///     Silence Detection. <see href="https://ffmpeg.org/ffmpeg-filters.html#silencedetect"/>
         /// </summary>
         /// <param name="noise_type">Set noise type to db (decibel) or ar (amplitude ratio). Default is dB</param>
-    /// <param name="noise">
-    ///     Set noise tolerance. Can be specified in dB (in case "dB" is appended to the specified value) or amplitude ratio.
-    ///     Default is -60dB, or 0.001.
-    /// </param>
-    /// <param name="duration">
-    ///     Set silence duration until notification (default is 2 seconds). See (ffmpeg-utils)the Time duration section in the
-    ///     ffmpeg-utils(1) manual for the accepted syntax.
-    /// </param>
+        /// <param name="noise">Set noise tolerance. Can be specified in dB (in case "dB" is appended to the specified value) or amplitude ratio. Default is -60dB, or 0.001.</param>
+        /// <param name="duration">Set silence duration until notification (default is 2 seconds). See (ffmpeg-utils)the Time duration section in the ffmpeg-utils(1) manual for the accepted syntax.</param>
         /// <param name="mono">Process each channel separately, instead of combined. By default is disabled.</param>
+
         public SilenceDetectArgument(string noise_type = "db", double noise = 60, double duration = 2, bool mono = false)
         {
             if (noise_type == "db")
@@ -42,3 +36,4 @@ public class SilenceDetectArgument : IAudioFilterArgument
 
         public string Value => string.Join(":", _arguments.Select(pair => $"{pair.Key}={pair.Value}"));
     }
+}

FFMpegCore/FFMpeg/Arguments/SizeArgument.cs

@@ -1,14 +1,13 @@
 using System.Drawing;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents size parameter
     /// </summary>
     public class SizeArgument : IArgument
     {
         public readonly Size? Size;
-
         public SizeArgument(Size? size)
         {
             Size = size;
@@ -18,3 +17,4 @@ public class SizeArgument : IArgument
 
         public string Text => Size == null ? string.Empty : $"-s {Size.Value.Width}x{Size.Value.Height}";
     }
+}

FFMpegCore/FFMpeg/Arguments/SpeedPresetArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents speed parameter
     /// </summary>
@@ -16,3 +16,4 @@ public class SpeedPresetArgument : IArgument
 
         public string Text => $"-preset {Speed.ToString().ToLowerInvariant()}";
     }
+}

FFMpegCore/FFMpeg/Arguments/StartNumberArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents start number parameter
     /// </summary>
@@ -14,3 +14,4 @@ public class StartNumberArgument : IArgument
 
         public string Text => $"-start_number {StartNumber}";
     }
+}

FFMpegCore/FFMpeg/Arguments/SubtitleHardBurnArgument.cs

@@ -1,8 +1,8 @@
 using System.Drawing;
 using FFMpegCore.Extend;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class SubtitleHardBurnArgument : IVideoFilterArgument
     {
         private readonly SubtitleHardBurnOptions _subtitleHardBurnOptions;
@@ -23,15 +23,6 @@ public class SubtitleHardBurnOptions
 
         public readonly Dictionary<string, string> Parameters = new();
 
-    private SubtitleHardBurnOptions(string subtitle)
-    {
-        _subtitle = subtitle;
-    }
-
-    internal string TextInternal => string
-        .Join(":", new[] { StringExtensions.EncloseInQuotes(StringExtensions.ToFFmpegLibavfilterPath(_subtitle)) }
-            .Concat(Parameters.Select(parameter => parameter.FormatArgumentPair(true))));
-
         /// <summary>
         ///     Create a new <see cref="SubtitleHardBurnOptions"/> using a provided subtitle file or a video file
         ///     containing one.
@@ -44,6 +35,11 @@ public class SubtitleHardBurnOptions
             return new SubtitleHardBurnOptions(subtitlePath);
         }
 
+        private SubtitleHardBurnOptions(string subtitle)
+        {
+            _subtitle = subtitle;
+        }
+
         /// <summary>
         ///     Specify the size of the original video, the video for which the ASS file was composed.
         /// </summary>
@@ -104,14 +100,16 @@ public class SubtitleHardBurnOptions
             Parameters.Add(key, value);
             return this;
         }
+
+        internal string TextInternal => string
+            .Join(":", new[] { StringExtensions.EncloseInQuotes(StringExtensions.ToFFmpegLibavfilterPath(_subtitle)) }
+            .Concat(Parameters.Select(parameter => parameter.FormatArgumentPair(enclose: true))));
     }
 
     public class StyleOptions
     {
         public readonly Dictionary<string, string> Parameters = new();
 
-    internal string TextInternal => string.Join(",", Parameters.Select(parameter => parameter.FormatArgumentPair(false)));
-
         public static StyleOptions Create()
         {
             return new StyleOptions();
@@ -128,4 +126,7 @@ public class StyleOptions
             Parameters.Add(key, value);
             return this;
         }
+
+        internal string TextInternal => string.Join(",", Parameters.Select(parameter => parameter.FormatArgumentPair(enclose: false)));
+    }
 }

FFMpegCore/FFMpeg/Arguments/ThreadsArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents threads parameter
     /// Number of threads used for video encoding
@@ -7,7 +7,6 @@
     public class ThreadsArgument : IArgument
     {
         public readonly int Threads;
-
         public ThreadsArgument(int threads)
         {
             Threads = threads;
@@ -17,3 +16,4 @@ public class ThreadsArgument : IArgument
 
         public string Text => $"-threads {Threads}";
     }
+}

FFMpegCore/FFMpeg/Arguments/TransposeArgument.cs

@@ -1,7 +1,7 @@
 using FFMpegCore.Enums;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Transpose argument.
     /// 0 = 90CounterCLockwise and Vertical Flip (default)
@@ -12,7 +12,6 @@ namespace FFMpegCore.Arguments;
     public class TransposeArgument : IVideoFilterArgument
     {
         public readonly Transposition Transposition;
-
         public TransposeArgument(Transposition transposition)
         {
             Transposition = transposition;
@@ -21,3 +20,4 @@ public class TransposeArgument : IVideoFilterArgument
         public string Key { get; } = "transpose";
         public string Value => ((int)Transposition).ToString();
     }
+}

FFMpegCore/FFMpeg/Arguments/VariableBitRateArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Variable Bitrate Argument (VBR) argument
     /// </summary>
@@ -19,3 +19,4 @@ public class VariableBitRateArgument : IArgument
 
         public string Text => $"-vbr {Vbr}";
     }
+}

FFMpegCore/FFMpeg/Arguments/VerbosityLevelArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class VerbosityLevelArgument : IArgument
     {
         private readonly VerbosityLevel _verbosityLevel;
@@ -8,7 +8,6 @@ public class VerbosityLevelArgument : IArgument
         {
             _verbosityLevel = verbosityLevel;
         }
-
         public string Text => $"{((int)_verbosityLevel < 32 ? "-hide_banner " : "")}-loglevel {_verbosityLevel.ToString().ToLowerInvariant()}";
     }
 
@@ -23,3 +22,4 @@ public enum VerbosityLevel
         Debug = 48,
         Trace = 56
     }
+}

FFMpegCore/FFMpeg/Arguments/VideoBitrateArgument.cs

@@ -1,5 +1,5 @@
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents video bitrate parameter
     /// </summary>
@@ -14,3 +14,4 @@ public class VideoBitrateArgument : IArgument
 
         public string Text => $"-b:v {Bitrate}k";
     }
+}

FFMpegCore/FFMpeg/Arguments/VideoCodecArgument.cs

@@ -1,8 +1,8 @@
 using FFMpegCore.Enums;
 using FFMpegCore.Exceptions;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     /// <summary>
     /// Represents video codec parameter
     /// </summary>
@@ -27,3 +27,4 @@ public class VideoCodecArgument : IArgument
 
         public string Text => $"-c:v {Codec}";
     }
+}

FFMpegCore/FFMpeg/Arguments/VideoFiltersArgument.cs

@@ -2,8 +2,8 @@
 using FFMpegCore.Enums;
 using FFMpegCore.Exceptions;
 
-namespace FFMpegCore.Arguments;
-
+namespace FFMpegCore.Arguments
+{
     public class VideoFiltersArgument : IArgument
     {
         public readonly VideoFilterOptions Options;
@@ -36,63 +36,24 @@ public class VideoFiltersArgument : IArgument
 
     public interface IVideoFilterArgument
     {
-    string Key { get; }
-    string Value { get; }
+        public string Key { get; }
+        public string Value { get; }
     }
 
     public class VideoFilterOptions
     {
         public List<IVideoFilterArgument> Arguments { get; } = new();
 
-    public VideoFilterOptions Scale(VideoSize videoSize)
-    {
-        return WithArgument(new ScaleArgument(videoSize));
-    }
-
-    public VideoFilterOptions Scale(int width, int height)
-    {
-        return WithArgument(new ScaleArgument(width, height));
-    }
-
-    public VideoFilterOptions Scale(Size size)
-    {
-        return WithArgument(new ScaleArgument(size));
-    }
-
-    public VideoFilterOptions Transpose(Transposition transposition)
-    {
-        return WithArgument(new TransposeArgument(transposition));
-    }
-
-    public VideoFilterOptions Mirror(Mirroring mirroring)
-    {
-        return WithArgument(new SetMirroringArgument(mirroring));
-    }
-
-    public VideoFilterOptions DrawText(DrawTextOptions drawTextOptions)
-    {
-        return WithArgument(new DrawTextArgument(drawTextOptions));
-    }
-
-    public VideoFilterOptions HardBurnSubtitle(SubtitleHardBurnOptions subtitleHardBurnOptions)
-    {
-        return WithArgument(new SubtitleHardBurnArgument(subtitleHardBurnOptions));
-    }
-
-    public VideoFilterOptions BlackDetect(double minimumDuration = 2.0, double pictureBlackRatioThreshold = 0.98, double pixelBlackThreshold = 0.1)
-    {
-        return WithArgument(new BlackDetectArgument(minimumDuration, pictureBlackRatioThreshold, pixelBlackThreshold));
-    }
-
-    public VideoFilterOptions BlackFrame(int amount = 98, int threshold = 32)
-    {
-        return WithArgument(new BlackFrameArgument(amount, threshold));
-    }
-
-    public VideoFilterOptions Pad(PadOptions padOptions)
-    {
-        return WithArgument(new PadArgument(padOptions));
-    }
+        public VideoFilterOptions Scale(VideoSize videoSize) => WithArgument(new ScaleArgument(videoSize));
+        public VideoFilterOptions Scale(int width, int height) => WithArgument(new ScaleArgument(width, height));
+        public VideoFilterOptions Scale(Size size) => WithArgument(new ScaleArgument(size));
+        public VideoFilterOptions Transpose(Transposition transposition) => WithArgument(new TransposeArgument(transposition));
+        public VideoFilterOptions Mirror(Mirroring mirroring) => WithArgument(new SetMirroringArgument(mirroring));
+        public VideoFilterOptions DrawText(DrawTextOptions drawTextOptions) => WithArgument(new DrawTextArgument(drawTextOptions));
+        public VideoFilterOptions HardBurnSubtitle(SubtitleHardBurnOptions subtitleHardBurnOptions) => WithArgument(new SubtitleHardBurnArgument(subtitleHardBurnOptions));
+        public VideoFilterOptions BlackDetect(double minimumDuration = 2.0, double pictureBlackRatioThreshold = 0.98, double pixelBlackThreshold = 0.1) => WithArgument(new BlackDetectArgument(minimumDuration, pictureBlackRatioThreshold, pixelBlackThreshold));
+        public VideoFilterOptions BlackFrame(int amount = 98, int threshold = 32) => WithArgument(new BlackFrameArgument(amount, threshold));
+        public VideoFilterOptions Pad(PadOptions padOptions) => WithArgument(new PadArgument(padOptions));
 
         private VideoFilterOptions WithArgument(IVideoFilterArgument argument)
         {
@@ -100,3 +61,4 @@ public class VideoFilterOptions
             return this;
         }
     }
+}

FFMpegCore/FFMpeg/Builders/MetaData/ChapterData.cs

@@ -1,17 +1,18 @@
-namespace FFMpegCore.Builders.MetaData;
-
+namespace FFMpegCore.Builders.MetaData
+{
     public class ChapterData
     {
+        public string Title { get; private set; }
+        public TimeSpan Start { get; private set; }
+        public TimeSpan End { get; private set; }
+
+        public TimeSpan Duration => End - Start;
+
         public ChapterData(string title, TimeSpan start, TimeSpan end)
         {
             Title = title;
             Start = start;
             End = end;
         }
-
-    public string Title { get; private set; }
-    public TimeSpan Start { get; }
-    public TimeSpan End { get; }
-
-    public TimeSpan Duration => End - Start;
+    }
 }

FFMpegCore/FFMpeg/Builders/MetaData/IReadOnlyMetaData.cs

@@ -1,7 +1,9 @@
-namespace FFMpegCore.Builders.MetaData;
+namespace FFMpegCore.Builders.MetaData
+{
 
     public interface IReadOnlyMetaData
     {
         IReadOnlyList<ChapterData> Chapters { get; }
         IReadOnlyDictionary<string, string> Entries { get; }
     }
+}