diff --git a/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml.cs b/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml.cs index 90f6421..58fecec 100644 --- a/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml.cs +++ b/Application/FileConverter/Controls/EncodingQualitySliderControl.xaml.cs @@ -145,6 +145,21 @@ namespace FileConverter.Controls sliderControl.Ticks.Add(500); break; } + + case EncodingMode.AacVBR: + { + sliderControl.Minimum = 52; + sliderControl.Maximum = 208; + sliderControl.SelectionStart = 72; + sliderControl.SelectionEnd = 136; + sliderControl.Ticks.Clear(); + sliderControl.Ticks.Add(52); + sliderControl.Ticks.Add(72); + sliderControl.Ticks.Add(104); + sliderControl.Ticks.Add(136); + sliderControl.Ticks.Add(208); + break; + } } encodingQualitySliderControl.CoerceValue(EncodingQualitySliderControl.BitrateProperty); diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs index 11e25c5..673bf70 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs @@ -98,7 +98,21 @@ namespace FileConverter.ConversionJobs break; case OutputType.Flac: - arguments = string.Format("-n -stats -i \"{0}\" \"{1}\"", this.InputFilePath, this.OutputFilePath); + { + arguments = string.Format("-n -stats -i \"{0}\" \"{1}\"", this.InputFilePath, this.OutputFilePath); + } + + break; + + case OutputType.Mkv: + { + int videoEncodingQuality = this.ConversionPreset.GetSettingsValue("VideoQuality"); + string videoEncodingSpeed = this.ConversionPreset.GetSettingsValue("VideoEncodingSpeed"); + int audioEncodingQuality = this.ConversionPreset.GetSettingsValue("Bitrate"); + 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(audioEncodingQuality)); + arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); + } + break; default: @@ -267,6 +281,82 @@ namespace FileConverter.ConversionJobs throw new Exception("Unknown Wav encoding."); } + /// + /// Convert video quality index to H264 constant rate factor. + /// + /// The quality index. + /// Returns the H264 constant rate factor. + /// The range of the quantizer scale is 0-51: where 0 is lossless, 23 is default, and 51 is worst possible. + /// A lower value is a higher quality and a subjectively sane range is 18-28. + /// https://trac.ffmpeg.org/wiki/Encode/H.264 + private int H264QualityToCRF(int quality) + { + return 51 - quality; + } + + /// + /// Convert video encoding speed to H264 preset. + /// + /// The encoding speed. + /// The H264 preset. + private string H264EncodingSpeedToPreset(string encodingSpeed) + { + switch (encodingSpeed) + { + case "Ultra Fast": + return "ultrafast"; + + case "Super Fast": + return "superfast"; + + case "Very Fast": + return "veryfast"; + + case "Faster": + return "faster"; + + case "Fast": + return "fast"; + + case "Medium": + return "medium"; + + case "Slow": + return "slow"; + + case "Slower": + return "slower"; + + case "Very Slow": + return "veryslow"; + } + + throw new Exception("Unknown H264 encoding speed."); + } + + private int AACBitrateToQualityIndex(int bitrate) + { + switch (bitrate) + { + case 52: + return 1; + + case 72: + return 2; + + case 104: + return 3; + + case 136: + return 4; + + case 208: + return 5; + } + + throw new Exception("Unknown VBR bitrate."); + } + private void ParseFFMPEGOutput(string input) { Match match = this.durationRegex.Match(input); diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs index 04e9873..446bfcb 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -344,6 +344,17 @@ namespace FileConverter return true; } + break; + + case OutputType.Mkv: + switch (settingsKey) + { + case "Bitrate": + case "VideoQuality": + case "VideoEncodingSpeed": + return true; + } + break; } @@ -354,7 +365,7 @@ namespace FileConverter { if (outputType == OutputType.Wav) { - this.InitializeSettingsValue("Encoding", "Wav16"); + this.InitializeSettingsValue("Encoding", EncodingMode.Wav16.ToString()); } if (outputType == OutputType.Mp3) @@ -368,6 +379,17 @@ namespace FileConverter this.InitializeSettingsValue("Bitrate", "160"); } + if (outputType == OutputType.Flac) + { + } + + if (outputType == OutputType.Mkv) + { + this.InitializeSettingsValue("VideoQuality", "28"); + this.InitializeSettingsValue("VideoEncodingSpeed", "veryslow"); + this.InitializeSettingsValue("Bitrate", "104"); + } + this.OnPropertyChanged("Settings"); } diff --git a/Application/FileConverter/EncodingMode.cs b/Application/FileConverter/EncodingMode.cs index 36e8d7b..4b4fb06 100644 --- a/Application/FileConverter/EncodingMode.cs +++ b/Application/FileConverter/EncodingMode.cs @@ -13,5 +13,7 @@ namespace FileConverter Mp3CBR, OggVBR, + + AacVBR, } } \ No newline at end of file diff --git a/Application/FileConverter/OutputType.cs b/Application/FileConverter/OutputType.cs index 40cd48b..57a25d0 100644 --- a/Application/FileConverter/OutputType.cs +++ b/Application/FileConverter/OutputType.cs @@ -5,6 +5,7 @@ namespace FileConverter public enum OutputType { None, + Mkv, Mp3, Ogg, Flac, diff --git a/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs b/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs index 46b2fe3..a11723e 100644 --- a/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs +++ b/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs @@ -31,6 +31,12 @@ namespace FileConverter.Windows set; } + public DataTemplate MkvSettingsDataTemplate + { + get; + set; + } + public override DataTemplate SelectTemplate(object item, DependencyObject container) { if (item == null) @@ -50,6 +56,9 @@ namespace FileConverter.Windows case OutputType.Ogg: return this.OggSettingsDataTemplate; + + case OutputType.Mkv: + return this.MkvSettingsDataTemplate; } return this.DefaultDataTemplate; diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml index 2d2df91..cc4fafc 100644 --- a/Application/FileConverter/Windows/SettingsWindow.xaml +++ b/Application/FileConverter/Windows/SettingsWindow.xaml @@ -99,11 +99,47 @@ + + + + + + + OggSettingsDataTemplate="{StaticResource OggSettingsDataTemplate}" + MkvSettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}" /> diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml.cs b/Application/FileConverter/Windows/SettingsWindow.xaml.cs index d428a99..4b24ea5 100644 --- a/Application/FileConverter/Windows/SettingsWindow.xaml.cs +++ b/Application/FileConverter/Windows/SettingsWindow.xaml.cs @@ -35,7 +35,8 @@ namespace FileConverter OutputType[] outputTypes = new[] { OutputType.Flac, - OutputType.Mp3, + OutputType.Mkv, + OutputType.Mp3, OutputType.Ogg, OutputType.Wav, };