Merge branch 'master' into add-pcm-wrapper

Former-commit-id: 9632bf5b30

FFMpegCore.Test/ArgumentBuilderTest.cs

@@ -192,6 +192,17 @@ public void Builder_BuildString_Transpose()
             Assert.AreEqual("-i \"input.mp4\" -vf \"transpose=2\" \"output.mp4\"", str);
         }
 
+        [TestMethod]
+        public void Builder_BuildString_Mirroring()
+        {
+            var str = FFMpegArguments.FromFileInput("input.mp4")
+                .OutputToFile("output.mp4", false, opt => opt
+                    .WithVideoFilters(filterOptions => filterOptions
+                        .Mirror(Mirroring.Horizontal)))
+                .Arguments;
+            Assert.AreEqual("-i \"input.mp4\" -vf \"hflip\" \"output.mp4\"", str);
+        }
+
         [TestMethod]
         public void Builder_BuildString_TransposeScale()
         {

FFMpegCore.sln

@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.28307.329
+VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMpegCore", "FFMpegCore\FFMpegCore.csproj", "{19DE2EC2-9955-4712-8096-C22EF6713E4F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFMpegCore", "FFMpegCore\FFMpegCore.csproj", "{19DE2EC2-9955-4712-8096-C22EF6713E4F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFMpegCore.Test", "FFMpegCore.Test\FFMpegCore.Test.csproj", "{F20C8353-72D9-454B-9F16-3624DBAD2328}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMpegCore.Examples", "FFMpegCore.Examples\FFMpegCore.Examples.csproj", "{3125CF91-FFBD-4E4E-8930-247116AFE772}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FFMpegCore.Examples", "FFMpegCore.Examples\FFMpegCore.Examples.csproj", "{3125CF91-FFBD-4E4E-8930-247116AFE772}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

FFMpegCore/FFMpeg/Arguments/SetMirroringArgument.cs

@@ -0,0 +1,32 @@
+using FFMpegCore.Enums;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace FFMpegCore.Arguments
+{
+    public class SetMirroringArgument : IVideoFilterArgument
+    {
+        public SetMirroringArgument(Mirroring mirroring)
+        {
+            Mirroring = mirroring;
+        }
+
+        public Mirroring Mirroring { get; set; }
+
+        public string Key => string.Empty;
+
+        public string Value
+        {
+            get
+            {
+                return Mirroring switch
+                {
+                    Mirroring.Horizontal => "hflip",
+                    Mirroring.Vertical => "vflip",
+                    _ => throw new ArgumentOutOfRangeException(nameof(Mirroring))
+                };
+            }
+        }
+    }
+}

FFMpegCore/FFMpeg/Arguments/VideoFiltersArgument.cs

@@ -17,12 +17,20 @@ public VideoFiltersArgument(VideoFilterOptions options)
 
         public string Text => GetText();
 
-        public string GetText()
+        private string GetText()
         {
             if (!Options.Arguments.Any())
                 throw new FFMpegArgumentException("No video-filter arguments provided");
 
-            return $"-vf \"{string.Join(", ", Options.Arguments.Where(arg => !string.IsNullOrEmpty(arg.Value)).Select(arg => $"{arg.Key}={arg.Value.Replace(",", "\\,")}"))}\"";
+            var arguments = Options.Arguments
+                .Where(arg => !string.IsNullOrEmpty(arg.Value))
+                .Select(arg =>
+                {
+                    var escapedValue = arg.Value.Replace(",", "\\,");
+                    return string.IsNullOrEmpty(arg.Key) ? escapedValue : $"{arg.Key}={escapedValue}";
+                });
+
+            return $"-vf \"{string.Join(", ", arguments)}\"";
         }
     }
 
@@ -40,6 +48,7 @@ public class VideoFilterOptions
         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));
 
         private VideoFilterOptions WithArgument(IVideoFilterArgument argument)

FFMpegCore/FFMpeg/Enums/Mirroring.cs

@@ -0,0 +1,8 @@
+namespace FFMpegCore.Enums
+{
+    public enum Mirroring
+    {
+        Vertical,
+        Horizontal
+    }
+}

FFMpegCore/FFMpegCore.csproj

@@ -9,11 +9,9 @@
     <Version>3.0.0.0</Version>
     <AssemblyVersion>3.0.0.0</AssemblyVersion>
     <FileVersion>3.0.0.0</FileVersion>
-    <PackageReleaseNotes>- Fixes for RawVideoPipeSource hanging (thanks to max619)
+    <PackageReleaseNotes>- Added support for mirroring video filter (thanks gorobvictor)</PackageReleaseNotes>
-- Added .OutputToUrl(..) method for outputting to url using supported protocol (thanks to TFleury) 
-- Improved timespan parsing (thanks to test-in-prod)</PackageReleaseNotes>
     <LangVersion>8</LangVersion>
-    <PackageVersion>4.1.0</PackageVersion>
+    <PackageVersion>4.2.0</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>Malte Rosenbjerg, Vlad Jerca, Max Bagryantsev</Authors>
     <PackageTags>ffmpeg ffprobe convert video audio mediafile resize analyze muxing</PackageTags>