Merge f31dc2b1cd into 25d7ae8374

.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.Test/VideoTest.cs

@@ -467,7 +467,7 @@ namespace FFMpegCore.Test
         }
 
         [TestMethod, Timeout(BaseTimeoutMilliseconds)]
-        public void Video_Snapshot_Png_PersistSnapshot()
+        public void Video_Snapshot_PersistSnapshot()
         {
             using var outputPath = new TemporaryFile("out.png");
             var input = FFProbe.Analyse(TestResources.Mp4Video);
@@ -480,63 +480,6 @@ namespace FFMpegCore.Test
             Assert.AreEqual("png", analysis.PrimaryVideoStream!.CodecName);
         }
 
-        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
-        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)]
-        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)]
-        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)]
-        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)]
         public void Video_Snapshot_Rotated_PersistSnapshot()
         {

FFMpegCore/FFMpeg/Arguments/IDynamicArgument.cs

@@ -8,6 +8,6 @@
         /// <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/VideoFiltersArgument.cs

@@ -36,8 +36,8 @@ namespace FFMpegCore.Arguments
 
     public interface IVideoFilterArgument
     {
-        string Key { get; }
-        string Value { get; }
+        public string Key { get; }
+        public string Value { get; }
     }
 
     public class VideoFilterOptions

FFMpegCore/FFMpeg/Enums/Enums.cs

@@ -15,33 +15,9 @@
         public static Codec LibX265 => FFMpeg.GetCodec("libx265");
         public static Codec LibVpx => FFMpeg.GetCodec("libvpx");
         public static Codec LibTheora => FFMpeg.GetCodec("libtheora");
+        public static Codec Png => FFMpeg.GetCodec("png");
         public static Codec MpegTs => FFMpeg.GetCodec("mpegts");
         public static Codec LibaomAv1 => FFMpeg.GetCodec("libaom-av1");
-
-        public static class Image
-        {
-            public static Codec Png => FFMpeg.GetCodec("png");
-            public static Codec Jpg => FFMpeg.GetCodec("mjpeg");
-            public static Codec Bmp => FFMpeg.GetCodec("bmp");
-            public static Codec Webp => FFMpeg.GetCodec("webp");
-
-            public static Codec GetByExtension(string path)
-            {
-                var ext = Path.GetExtension(path);
-                switch (ext)
-                {
-                    case FileExtension.Image.Png:
-                        return Png;
-                    case FileExtension.Image.Jpg:
-                        return Jpg;
-                    case FileExtension.Image.Bmp:
-                        return Bmp;
-                    case FileExtension.Image.Webp:
-                        return Webp;
-                    default: throw new NotSupportedException($"Unsupported image extension: {ext}");
-                }
-            }
-        }
     }
 
     public static class AudioCodec

FFMpegCore/FFMpeg/Enums/FileExtension.cs

@@ -10,10 +10,7 @@
                 "libxvpx" => WebM,
                 "libxtheora" => Ogv,
                 "mpegts" => Ts,
-                "png" => Image.Png,
-                "jpg" => Image.Jpg,
-                "bmp" => Image.Bmp,
-                "webp" => Image.Webp,
+                "png" => Png,
                 _ => throw new Exception("The extension for this video type is not defined.")
             };
         }
@@ -21,16 +18,8 @@
         public static readonly string Ts = VideoType.MpegTs.Extension;
         public static readonly string Ogv = VideoType.Ogv.Extension;
         public static readonly string WebM = VideoType.WebM.Extension;
+        public static readonly string Png = ".png";
         public static readonly string Mp3 = ".mp3";
         public static readonly string Gif = ".gif";
-
-        public static class Image
-        {
-            public const string Png = ".png";
-            public const string Jpg = ".jpg";
-            public const string Bmp = ".bmp";
-            public const string Webp = ".webp";
-            public static readonly List<string> All = [Png, Jpg, Bmp, Webp];
-        }
     }
 }

FFMpegCore/FFMpeg/FFMpeg.cs

@@ -20,11 +20,16 @@ namespace FFMpegCore
         /// <returns>Bitmap with the requested snapshot.</returns>
         public static bool Snapshot(string input, string output, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
         {
-            CheckSnapshotOutputExtension(output, FileExtension.Image.All);
+            if (Path.GetExtension(output) != FileExtension.Png)
+            {
+                output = Path.Combine(Path.GetDirectoryName(output), Path.GetFileNameWithoutExtension(output) + FileExtension.Png);
+            }
 
             var source = FFProbe.Analyse(input);
+            var (arguments, outputOptions) = SnapshotArgumentBuilder.BuildSnapshotArguments(input, source, size, captureTime, streamIndex, inputFileIndex);
 
-            return SnapshotProcess(input, output, source, size, captureTime, streamIndex, inputFileIndex)
+            return arguments
+                .OutputToFile(output, true, outputOptions)
                 .ProcessSynchronously();
         }
         /// <summary>
@@ -39,55 +44,47 @@ namespace FFMpegCore
         /// <returns>Bitmap with the requested snapshot.</returns>
         public static async Task<bool> SnapshotAsync(string input, string output, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
         {
-            CheckSnapshotOutputExtension(output, FileExtension.Image.All);
+            if (Path.GetExtension(output) != FileExtension.Png)
+            {
+                output = Path.Combine(Path.GetDirectoryName(output), Path.GetFileNameWithoutExtension(output) + FileExtension.Png);
+            }
 
             var source = await FFProbe.AnalyseAsync(input).ConfigureAwait(false);
+            var (arguments, outputOptions) = SnapshotArgumentBuilder.BuildSnapshotArguments(input, source, size, captureTime, streamIndex, inputFileIndex);
 
-            return await SnapshotProcess(input, output, source, size, captureTime, streamIndex, inputFileIndex)
+            return await arguments
+                .OutputToFile(output, true, outputOptions)
                 .ProcessAsynchronously();
         }
 
         public static bool GifSnapshot(string input, string output, Size? size = null, TimeSpan? captureTime = null, TimeSpan? duration = null, int? streamIndex = null)
         {
-            CheckSnapshotOutputExtension(output, [FileExtension.Gif]);
+            if (Path.GetExtension(output)?.ToLower() != FileExtension.Gif)
+            {
+                output = Path.Combine(Path.GetDirectoryName(output), Path.GetFileNameWithoutExtension(output) + FileExtension.Gif);
+            }
 
             var source = FFProbe.Analyse(input);
+            var (arguments, outputOptions) = SnapshotArgumentBuilder.BuildGifSnapshotArguments(input, source, size, captureTime, duration, streamIndex);
 
-            return GifSnapshotProcess(input, output, source, size, captureTime, duration, streamIndex)
+            return arguments
+                .OutputToFile(output, true, outputOptions)
                 .ProcessSynchronously();
         }
 
         public static async Task<bool> GifSnapshotAsync(string input, string output, Size? size = null, TimeSpan? captureTime = null, TimeSpan? duration = null, int? streamIndex = null)
         {
-            CheckSnapshotOutputExtension(output, [FileExtension.Gif]);
+            if (Path.GetExtension(output)?.ToLower() != FileExtension.Gif)
+            {
+                output = Path.Combine(Path.GetDirectoryName(output), Path.GetFileNameWithoutExtension(output) + FileExtension.Gif);
+            }
 
             var source = await FFProbe.AnalyseAsync(input).ConfigureAwait(false);
-
-            return await GifSnapshotProcess(input, output, source, size, captureTime, duration, streamIndex)
-                .ProcessAsynchronously();
-        }
-
-        private static FFMpegArgumentProcessor SnapshotProcess(string input, string output, IMediaAnalysis source, Size? size = null, TimeSpan? captureTime = null, int? streamIndex = null, int inputFileIndex = 0)
-        {
-            var (arguments, outputOptions) = SnapshotArgumentBuilder.BuildSnapshotArguments(input, output, source, size, captureTime, streamIndex, inputFileIndex);
-
-            return arguments.OutputToFile(output, true, outputOptions);
-        }
-
-        private static FFMpegArgumentProcessor GifSnapshotProcess(string input, string output, IMediaAnalysis source, Size? size = null, TimeSpan? captureTime = null, TimeSpan? duration = null, int? streamIndex = null)
-        {
             var (arguments, outputOptions) = SnapshotArgumentBuilder.BuildGifSnapshotArguments(input, source, size, captureTime, duration, streamIndex);
 
-            return arguments.OutputToFile(output, true, outputOptions);
-        }
-
-        private static void CheckSnapshotOutputExtension(string output, List<string> extensions)
-        {
-            if (!extensions.Contains(Path.GetExtension(output).ToLower()))
-            {
-                throw new ArgumentException(
-                    $"Invalid snapshot output extension: {output}, needed: {string.Join(",", FileExtension.Image.All)}");
-            }
+            return await arguments
+                .OutputToFile(output, true, outputOptions)
+                .ProcessAsynchronously();
         }
 
         /// <summary>

FFMpegCore/FFMpeg/SnapshotArgumentBuilder.cs

@@ -9,30 +9,6 @@ public static class SnapshotArgumentBuilder
 {
     public static (FFMpegArguments, Action<FFMpegArgumentOptions> outputOptions) BuildSnapshotArguments(
         string input,
-        string output,
-        IMediaAnalysis source,
-        Size? size = null,
-        TimeSpan? captureTime = null,
-        int? streamIndex = null,
-        int inputFileIndex = 0)
-    {
-        return BuildSnapshotArguments(input, VideoCodec.Image.GetByExtension(output), source, size, captureTime, streamIndex, inputFileIndex);
-    }
-
-    public static (FFMpegArguments, Action<FFMpegArgumentOptions> outputOptions) BuildSnapshotArguments(
-        string input,
-        IMediaAnalysis source,
-        Size? size = null,
-        TimeSpan? captureTime = null,
-        int? streamIndex = null,
-        int inputFileIndex = 0)
-    {
-        return BuildSnapshotArguments(input, VideoCodec.Image.Png, source, size, captureTime, streamIndex, inputFileIndex);
-    }
-
-    private static (FFMpegArguments, Action<FFMpegArgumentOptions> outputOptions) BuildSnapshotArguments(
-        string input,
-        Codec codec,
         IMediaAnalysis source,
         Size? size = null,
         TimeSpan? captureTime = null,
@@ -50,7 +26,7 @@ public static class SnapshotArgumentBuilder
                     .Seek(captureTime)),
             options => options
                 .SelectStream((int)streamIndex, inputFileIndex)
-                .WithVideoCodec(codec)
+                .WithVideoCodec(VideoCodec.Png)
                 .WithFrameOutputCount(1)
                 .Resize(size));
     }