File Converter release v2.1

.gitignore

@@ -196,3 +196,4 @@ FakesAssemblies/
 
 # Ignore the installer signing commands file
 Installer/Installer.sign
+Certificate/*

Application/FileConverter/Application.xaml.cs

@@ -1,7 +1,7 @@
 // <copyright file="Application.xaml.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
 
 /*  File Converter - This program allow you to convert file format to another.
-    Copyright (C) 2024 Adrien Allard
+    Copyright (C) 2025 Adrien Allard
     email: [email protected]
 
     This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by
@@ -38,8 +38,8 @@ public partial class Application : System.Windows.Application
         private static readonly Version Version = new Version()
                                                       {
                                                           Major = 2,
-                                                          Minor = 0,
-                                                          Patch = 2,
+                                                          Minor = 1,
+                                                          Patch = 0,
                                                       };
 
         private bool needToRunConversionThread;

Application/FileConverter/ConversionJobs/ConversionJobFactory.cs

@@ -43,8 +43,9 @@ public static ConversionJob Create(ConversionPreset conversionPreset, string inp
                 return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
             }
 
-            if (Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Image ||
-                Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Document)
+            if (conversionPreset.OutputType == OutputType.Jpg ||
+                conversionPreset.OutputType == OutputType.Png ||
+                conversionPreset.OutputType == OutputType.Webp)
             {
                 return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
             }

Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs

@@ -37,15 +37,23 @@ private static string ComputeAudioChannelArgs(ConversionPreset conversionPreset)
             return channelArgs;
         }
 
-        private static string ComputeTransformArgs(ConversionPreset conversionPreset)
+        private static string ComputeTransformArgs(ConversionPreset conversionPreset, Helpers.HardwareAccelerationMode hwAccel = Helpers.HardwareAccelerationMode.Off)
         {
             float scaleFactor = conversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.VideoScale);
             string scaleArgs = string.Empty;
 
             if (conversionPreset.OutputType == OutputType.Mkv || conversionPreset.OutputType == OutputType.Mp4)
             {
                 // This presets use h264 codec, the size of the video need to be divisible by 2.
-                scaleArgs = string.Format("scale=trunc(iw*{0}/2)*2:trunc(ih*{0}/2)*2", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
+                switch (hwAccel)
+                {
+                    case Helpers.HardwareAccelerationMode.CUDA:
+                        scaleArgs = string.Format("scale_cuda=trunc(iw*{0}/2)*2:trunc(ih*{0}/2)*2:format=yuv420p", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
+                        break;
+                    default:
+                        scaleArgs = string.Format("scale=trunc(iw*{0}/2)*2:trunc(ih*{0}/2)*2", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
+                        break;
+                }
             }
             else if (Math.Abs(scaleFactor - 1f) >= 0.005f)
             {
@@ -96,7 +104,7 @@ private static string ComputeTransformArgs(ConversionPreset conversionPreset)
                 transformArgs += rotationArgs;
             }
 
-            if (conversionPreset.OutputType == OutputType.Mkv || conversionPreset.OutputType == OutputType.Mp4)
+            if (hwAccel == Helpers.HardwareAccelerationMode.Off && (conversionPreset.OutputType == OutputType.Mkv || conversionPreset.OutputType == OutputType.Mp4))
             {
                 // http://trac.ffmpeg.org/wiki/Encode/H.264#Encodingfordumbplayers
                 // YUV planar color space with 4:2:0 chroma subsampling

Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs

@@ -7,10 +7,11 @@ namespace FileConverter.ConversionJobs
     using System.Diagnostics;
     using System.Globalization;
     using System.IO;
-    using System.Text.RegularExpressions;
-
-    using FileConverter.Controls;
-
+    using System.Text.RegularExpressions;
+    using CommunityToolkit.Mvvm.DependencyInjection;
+    using FileConverter.Controls;
+    using FileConverter.Services;
+
     public partial class ConversionJob_FFMPEG : ConversionJob
     {
         private readonly Regex durationRegex = new Regex(@"Duration:\s*([0-9][0-9]):([0-9][0-9]):([0-9][0-9])\.([0-9][0-9]),.*bitrate:\s*([0-9]+) kb\/s");
@@ -23,6 +24,8 @@ public partial class ConversionJob_FFMPEG : ConversionJob
 
         private readonly List<FFMpegPass> ffmpegArgumentStringByPass = new List<FFMpegPass>();
 
+        ISettingsService settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
         public ConversionJob_FFMPEG() : base()
         {
         }
@@ -255,7 +258,9 @@ protected virtual void FillFFMpegArgumentsList()
                         VideoEncodingSpeed videoEncodingSpeed = this.ConversionPreset.GetSettingsValue<VideoEncodingSpeed>(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed);
                         int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.AudioBitrate);
 
-                        string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset);
+                        Helpers.HardwareAccelerationMode hwAccel = settingsService.Settings.HardwareAccelerationMode;
+
+                        string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset, hwAccel);
                         string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs);
 
                         string audioArgs = "-an";
@@ -264,14 +269,23 @@ protected virtual void FillFFMpegArgumentsList()
                             audioArgs = $"-c:a aac -qscale:a {this.AACBitrateToQualityIndex(audioEncodingBitrate)}";
                         }
 
+                        string videoCodec = "libx264";
+                        string hwAccelArg = "";
+                        if (hwAccel == Helpers.HardwareAccelerationMode.CUDA)
+                        {
+                            videoCodec = "h264_nvenc";
+                            hwAccelArg = "-hwaccel cuda -hwaccel_output_format cuda";
+                        }
+
                         string encoderArgs = string.Format(
-                            "-c:v libx264 -preset {0} -crf {1} {2} {3}",
-                            this.H264EncodingSpeedToPreset(videoEncodingSpeed), 
+                            "-c:v {0} -preset {1} -crf {2} {3} {4}",
+                            videoCodec,
+                            this.H264EncodingSpeedToPreset(videoEncodingSpeed),
                             this.H264QualityToCRF(videoEncodingQuality),
-                            audioArgs, 
+                            audioArgs,
                             videoFilteringArgs);
 
-                        string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
+                        string arguments = string.Format("-n -stats {3} -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs, hwAccelArg);
 
                         this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments));
                     }

Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs

@@ -86,6 +86,12 @@ protected override void Convert()
                         readSettings.Format = MagickFormat.Dng;
                         break;
 
+                    case ".gif":
+                        // Get the first frame of the gif for conversion.
+                        // Maybe in the future make this user selectable.
+                        readSettings.FrameIndex = 0;
+                        break;
+
                     default:
                         break;
                 }
@@ -175,8 +181,8 @@ private void ConvertImage(MagickImage image, bool ignoreScale = false)
                 bool clampSizeToPowerOf2 = this.ConversionPreset.GetSettingsValue<bool>(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2);
                 if (clampSizeToPowerOf2)
                 {
-                    int referenceSize = System.Math.Min(image.Width, image.Height);
-                    int size = 2;
+                    uint referenceSize = System.Math.Min(image.Width, image.Height);
+                    uint size = 2;
                     while (size * 2 <= referenceSize)
                     {
                         size *= 2;
@@ -190,11 +196,11 @@ private void ConvertImage(MagickImage image, bool ignoreScale = false)
 
             if (this.ConversionPreset.IsRelevantSetting(ConversionPreset.ConversionSettingKeys.ImageMaximumSize))
             {
-                int maximumSize = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageMaximumSize);
+                uint maximumSize = this.ConversionPreset.GetSettingsValue<uint>(ConversionPreset.ConversionSettingKeys.ImageMaximumSize);
                 if (maximumSize > 0)
                 {
-                    int width = System.Math.Min(image.Width, maximumSize);
-                    int height = System.Math.Min(image.Height, maximumSize);
+                    uint width = System.Math.Min(image.Width, maximumSize);
+                    uint height = System.Math.Min(image.Height, maximumSize);
 
                     Debug.Log($"Clamp size to maximum size of {width}x{width} (from {image.Width}x{image.Height} to {width}x{height}).");
 
@@ -211,7 +217,7 @@ private void ConvertImage(MagickImage image, bool ignoreScale = false)
                     break;
 
                 case OutputType.Jpg:
-                    image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
+                    image.Quality = this.ConversionPreset.GetSettingsValue<uint>(ConversionPreset.ConversionSettingKeys.ImageQuality);
                     break;
 
                 case OutputType.Pdf:
@@ -220,7 +226,7 @@ private void ConvertImage(MagickImage image, bool ignoreScale = false)
                     break;
 
                 case OutputType.Webp:
-                    image.Quality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
+                    image.Quality = this.ConversionPreset.GetSettingsValue<uint>(ConversionPreset.ConversionSettingKeys.ImageQuality);
                     break;
 
                 default: