diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs index f0b89f8..77a2805 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs @@ -116,7 +116,15 @@ namespace FileConverter.ConversionJobs int videoEncodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality); string videoEncodingSpeed = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed); int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); - string encoderArgs = string.Format("-c:v libx264 -preset {0} -crf {1} -c:a aac -q:a {2} -strict experimental", this.H264EncodingSpeedToPreset(videoEncodingSpeed), this.H264QualityToCRF(videoEncodingQuality), this.AACBitrateToQualityIndex(audioEncodingBitrate)); + + float scaleFactor = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale); + string scaleArgs = string.Empty; + if (Math.Abs(scaleFactor - 1f) >= 0.005f) + { + scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture)); + } + + string encoderArgs = string.Format("-c:v libx264 -preset {0} -crf {1} -c:a aac -q:a {2} -strict experimental {3}", this.H264EncodingSpeedToPreset(videoEncodingSpeed), this.H264QualityToCRF(videoEncodingQuality), this.AACBitrateToQualityIndex(audioEncodingBitrate), scaleArgs); arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); } diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs index ae5eb29..1d06250 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -426,6 +426,7 @@ namespace FileConverter { case ConversionPreset.ConversionSettingKeys.AudioBitrate: case ConversionPreset.ConversionSettingKeys.VideoQuality: + case ConversionPreset.ConversionSettingKeys.VideoScale: case ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed: return true; } @@ -479,6 +480,7 @@ namespace FileConverter case OutputType.Mkv: this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "28"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, "Very Slow"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128"); break; @@ -651,6 +653,7 @@ namespace FileConverter public const string ImageScale = "ImageScale"; public const string VideoQuality = "VideoQuality"; public const string VideoEncodingSpeed = "VideoEncodingSpeed"; + public const string VideoScale = "VideoScale"; } } } diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml index c6bd9ee..226b754 100644 --- a/Application/FileConverter/Windows/SettingsWindow.xaml +++ b/Application/FileConverter/Windows/SettingsWindow.xaml @@ -112,42 +112,68 @@ - - + + + + + + + + + + + + + + + - - - - + +