diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs index 88b0ccc..e2e90f8 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs @@ -219,11 +219,17 @@ namespace FileConverter.ConversionJobs string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset); string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs); + string audioArgs = "-an"; + if (this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio)) + { + audioArgs = string.Format("-c:a aac -qscale:a {0}", this.AACBitrateToQualityIndex(audioEncodingBitrate)); + } + string encoderArgs = string.Format( - "-c:v libx264 -preset {0} -crf {1} -c:a aac -q:a {2} {3}", + "-c:v libx264 -preset {0} -crf {1} {2} {3}", this.H264EncodingSpeedToPreset(videoEncodingSpeed), this.H264QualityToCRF(videoEncodingQuality), - this.AACBitrateToQualityIndex(audioEncodingBitrate), + audioArgs, videoFilteringArgs); string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); @@ -278,7 +284,7 @@ namespace FileConverter.ConversionJobs { // https://trac.ffmpeg.org/wiki/Encode/VP9 int videoEncodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality); - int encodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); + int audioEncodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); string encodingArgs = string.Empty; if (videoEncodingQuality == 63) @@ -294,10 +300,16 @@ namespace FileConverter.ConversionJobs string transformArgs = ConversionJob_FFMPEG.ComputeTransformArgs(this.ConversionPreset); string videoFilteringArgs = ConversionJob_FFMPEG.Encapsulate("-vf", transformArgs); + string audioArgs = "-an"; + if (this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio)) + { + audioArgs = string.Format("-c:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(audioEncodingQuality)); + } + string encoderArgs = string.Format( - "-c:v libvpx-vp9 {0} -c:a libvorbis -q:a {1} {2}", + "-c:v libvpx-vp9 {0} {1} {2}", encodingArgs, - this.OGGVBRBitrateToQualityIndex(encodingQuality), + audioArgs, videoFilteringArgs); string 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 0e45380..2b3657a 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -444,6 +444,7 @@ namespace FileConverter break; case OutputType.Mkv: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "28"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, "Medium"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); @@ -457,6 +458,7 @@ namespace FileConverter break; case OutputType.Mp4: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "28"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed, "Medium"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); @@ -473,6 +475,7 @@ namespace FileConverter break; case OutputType.Webm: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "40"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml index 4dc28b5..d19272a 100644 --- a/Application/FileConverter/Windows/SettingsWindow.xaml +++ b/Application/FileConverter/Windows/SettingsWindow.xaml @@ -236,7 +236,7 @@ - @@ -283,13 +283,14 @@ - -