Merge pull request #19 from vladjerca/fix/conversion_size

FFMpeg.Core: Fix resizing issue (width was swapped with height)
vladjerca · Sep 22, 2018 · 6e7e03d · 6e7e03d
2 parents cc43430 + 38cffe5
commit 6e7e03d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/FFMpegSharp.Tests/VideoTest.cs b/FFMpegSharp.Tests/VideoTest.cs
@@ -37,7 +37,7 @@ public bool Convert(VideoType type, bool multithreaded = false, VideoSize size =
                            size != VideoSize.Original &&
                            outputVideo.Width != input.Width &&
                            outputVideo.Height != input.Height &&
-                           outputVideo.Width == (int)size
+                           outputVideo.Height == (int)size
                            )
                        );
             }

diff --git a/FFMpegSharp/FFMPEG/Atomic/Arguments.cs b/FFMpegSharp/FFMPEG/Atomic/Arguments.cs
@@ -82,9 +82,9 @@ internal static string Input(string template)
             return $"-i \"{template}\" ";
         }
 
-        internal static string Scale(VideoSize size, int height)
+        internal static string Scale(Size size)
         {
-            return size == VideoSize.Original ? string.Empty : $"-vf scale={(int)size}:{height} ";
+            return $"-vf scale={size.Width}:{size.Height} ";
         }
 
         internal static string Size(Size? size)

diff --git a/FFMpegSharp/FFMPEG/FFMpeg.cs b/FFMpegSharp/FFMPEG/FFMpeg.cs
@@ -137,15 +137,25 @@ public VideoInfo Convert(
             FFMpegHelper.ConversionSizeExceptionCheck(source);
 
             string args = "";
+
+            var scale = (double)source.Height / (int)size;
 
-            var height = source.Height * (source.Width / (int)size);
+            var outputSize = new Size(
+                        (int)(source.Width / scale),
+                        (int)(source.Height / scale)
+                    );
+
+            if (outputSize.Width % 2 != 0)
+            {
+                outputSize.Width += 1;
+            }
 
             switch (type)
             {
                 case VideoType.Mp4:
                     args = Arguments.Input(source) +
                                  Arguments.Threads(multithreaded) +
-                                 Arguments.Scale(size, height) +
+                                 Arguments.Scale(outputSize) +
                                  Arguments.Video(VideoCodec.LibX264, 2400) +
                                  Arguments.Speed(speed) +
                                  Arguments.Audio(AudioCodec.Aac, audioQuality) +
@@ -154,7 +164,7 @@ public VideoInfo Convert(
                 case VideoType.Ogv:
                     args = Arguments.Input(source) +
                                  Arguments.Threads(multithreaded) +
-                                 Arguments.Scale(size, height) +
+                                 Arguments.Scale(outputSize) +
                                  Arguments.Video(VideoCodec.LibTheora, 2400) +
                                  Arguments.Speed(16) +
                                  Arguments.Audio(AudioCodec.LibVorbis, audioQuality) +

diff --git a/FFMpegSharp/Properties/AssemblyInfo.cs b/FFMpegSharp/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]