From b8da1fe37a448cbe592188a353fff16600565a51 Mon Sep 17 00:00:00 2001 From: tacheometry <39647014+tacheometry@users.noreply.github.com> Date: Wed, 27 Mar 2024 20:01:43 +0200 Subject: [PATCH] Full CUDA transcoding --- .../ConversionJob_FFMPEG.Converters.cs | 14 +++++++++++--- .../ConversionJobs/ConversionJob_FFMPEG.cs | 8 +++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs index a738389..35d46b1 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs @@ -37,7 +37,7 @@ namespace FileConverter.ConversionJobs return channelArgs; } - private static string ComputeTransformArgs(ConversionPreset conversionPreset) + private static string ComputeTransformArgs(ConversionPreset conversionPreset, Helpers.HardwareAccelerationMode hwAccel = Helpers.HardwareAccelerationMode.Off) { float scaleFactor = conversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale); string scaleArgs = string.Empty; @@ -45,7 +45,15 @@ namespace FileConverter.ConversionJobs 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 @@ namespace FileConverter.ConversionJobs 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 diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs index efb5c46..99c9e93 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs @@ -258,7 +258,9 @@ namespace FileConverter.ConversionJobs VideoEncodingSpeed videoEncodingSpeed = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed); int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue(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"; @@ -269,10 +271,10 @@ namespace FileConverter.ConversionJobs string videoCodec = "libx264"; string hwAccelArg = ""; - if (settingsService.Settings.HardwareAccelerationMode == Helpers.HardwareAccelerationMode.CUDA) + if (hwAccel == Helpers.HardwareAccelerationMode.CUDA) { videoCodec = "h264_nvenc"; - hwAccelArg = "-hwaccel cuda"; + hwAccelArg = "-hwaccel cuda -hwaccel_output_format cuda"; } string encoderArgs = string.Format(