diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs index a2190c9..a2e3210 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.Converters.cs @@ -19,6 +19,24 @@ namespace FileConverter.ConversionJobs return string.Format("{0} \"{1}\"", optionName, args); } + /// + /// Compute the argument needed to change the number of channels in an audio file. + /// + /// The conversion preset + /// The argument string. + /// https://trac.ffmpeg.org/wiki/AudioChannelManipulation + private static string ComputeAudioChannelArgs(ConversionPreset conversionPreset) + { + string channelArgs = string.Empty; + int channelCount = conversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount); + if (channelCount > 0) + { + channelArgs = $"-ac {channelCount}"; + } + + return channelArgs; + } + private static string ComputeTransformArgs(ConversionPreset conversionPreset) { float scaleFactor = conversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale); diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs index d0aab89..6cb53ef 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs @@ -77,9 +77,12 @@ namespace FileConverter.ConversionJobs { case OutputType.Aac: { + string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset); + // https://trac.ffmpeg.org/wiki/Encode/AAC int audioEncodingBitrate = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); - string encoderArgs = string.Format("-c:a aac -q:a {0}", this.AACBitrateToQualityIndex(audioEncodingBitrate)); + string encoderArgs = $"-c:a aac -q:a {this.AACBitrateToQualityIndex(audioEncodingBitrate)} {channelArgs}"; + string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments)); @@ -113,8 +116,10 @@ namespace FileConverter.ConversionJobs case OutputType.Flac: { + string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset); + // http://taer-naguur.blogspot.fr/2013/11/flac-audio-encoding-with-ffmpeg.html - string encoderArgs = string.Format("-compression_level 12"); + string encoderArgs = $"-compression_level 12 {channelArgs}"; string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments)); @@ -185,17 +190,19 @@ namespace FileConverter.ConversionJobs case OutputType.Mp3: { + string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset); + string encoderArgs = string.Empty; EncodingMode encodingMode = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode); int encodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); switch (encodingMode) { case EncodingMode.Mp3VBR: - encoderArgs = string.Format("-codec:a libmp3lame -q:a {0}", this.MP3VBRBitrateToQualityIndex(encodingQuality)); + encoderArgs = $"-codec:a libmp3lame -q:a {this.MP3VBRBitrateToQualityIndex(encodingQuality)} {channelArgs}"; break; case EncodingMode.Mp3CBR: - encoderArgs = string.Format("-codec:a libmp3lame -b:a {0}k", encodingQuality); + encoderArgs = $"-codec:a libmp3lame -b:a {encodingQuality}k {channelArgs}"; break; default: @@ -243,8 +250,10 @@ namespace FileConverter.ConversionJobs case OutputType.Ogg: { + string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset); + int encodingQuality = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate); - string encoderArgs = string.Format("-vn -codec:a libvorbis -qscale:a {0}", this.OGGVBRBitrateToQualityIndex(encodingQuality)); + string encoderArgs = $"-vn -codec:a libvorbis -qscale:a {this.OGGVBRBitrateToQualityIndex(encodingQuality)} {channelArgs}"; string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments)); @@ -301,8 +310,10 @@ namespace FileConverter.ConversionJobs case OutputType.Wav: { + string channelArgs = ConversionJob_FFMPEG.ComputeAudioChannelArgs(this.ConversionPreset); + EncodingMode encodingMode = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode); - string encoderArgs = string.Format("-acodec {0}", this.WAVEncodingToCodecArgument(encodingMode)); + string encoderArgs = $"-acodec {this.WAVEncodingToCodecArgument(encodingMode)} {channelArgs}"; string arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); this.ffmpegArgumentStringByPass.Add(new FFMpegPass(arguments)); @@ -367,7 +378,7 @@ namespace FileConverter.ConversionJobs } } } - + protected override void Convert() { if (this.ConversionPreset == null) diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs index 66b27b8..5228799 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -412,14 +412,76 @@ namespace FileConverter switch (outputType) { + // Audio case OutputType.Aac: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0"); + break; + + case OutputType.Flac: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0"); + break; + + case OutputType.Ogg: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0"); + break; + + case OutputType.Mp3: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Mp3VBR.ToString(), true); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0"); + break; + + case OutputType.Wav: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Wav16.ToString(), true); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioChannelCount, "0"); + break; + + // Video + case OutputType.Avi: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "20"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190"); + 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"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128"); break; - case OutputType.Ico: - case OutputType.Flac: + 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"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128"); break; + case OutputType.Ogv: + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "7"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160"); + 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"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); + break; + + // Images case OutputType.Gif: this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); @@ -441,61 +503,10 @@ namespace FileConverter this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0"); break; - case OutputType.Avi: - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "20"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190"); - 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"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128"); - break; - - case OutputType.Mp3: - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Mp3VBR.ToString(), true); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "190"); - 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"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128"); - break; - - case OutputType.Ogg: - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160"); - break; - - case OutputType.Ogv: - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.EnableAudio, "True"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoQuality, "7"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, "1"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "160"); - break; - - case OutputType.Wav: - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioEncodingMode, EncodingMode.Wav16.ToString(), true); - 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"); - this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation, "0"); + case OutputType.Ico: break; + // Documents case OutputType.Pdf: break; @@ -651,6 +662,7 @@ namespace FileConverter { public const string AudioEncodingMode = "AudioEncodingMode"; public const string AudioBitrate = "AudioBitrate"; + public const string AudioChannelCount = "AudioChannelCount"; public const string ImageQuality = "ImageQuality"; public const string ImageScale = "ImageScale"; public const string ImageRotation = "ImageRotation"; diff --git a/Application/FileConverter/Properties/Resources.Designer.cs b/Application/FileConverter/Properties/Resources.Designer.cs index 4c2b527..f154f73 100644 --- a/Application/FileConverter/Properties/Resources.Designer.cs +++ b/Application/FileConverter/Properties/Resources.Designer.cs @@ -132,6 +132,24 @@ namespace FileConverter.Properties { } } + /// + /// Looks up a localized string similar to Channel count :. + /// + public static string ChannelCountTitle { + get { + return ResourceManager.GetString("ChannelCountTitle", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Change the number of channels of the input file.. + /// + public static string ChannelCountTooltip { + get { + return ResourceManager.GetString("ChannelCountTooltip", resourceCulture); + } + } + /// /// Looks up a localized string similar to Clamp to lowest power of 2 size. /// @@ -645,6 +663,15 @@ namespace FileConverter.Properties { } } + /// + /// Looks up a localized string similar to Mono. + /// + public static string MonoOption { + get { + return ResourceManager.GetString("MonoOption", resourceCulture); + } + } + /// /// Looks up a localized string similar to Move down selected preset. /// @@ -832,6 +859,15 @@ namespace FileConverter.Properties { } } + /// + /// Looks up a localized string similar to Same than input file. + /// + public static string SameChannelCountOption { + get { + return ResourceManager.GetString("SameChannelCountOption", resourceCulture); + } + } + /// /// Looks up a localized string similar to Save. /// @@ -877,6 +913,15 @@ namespace FileConverter.Properties { } } + /// + /// Looks up a localized string similar to Stereo. + /// + public static string StereoOption { + get { + return ResourceManager.GetString("StereoOption", resourceCulture); + } + } + /// /// Looks up a localized string similar to Animated Image. /// diff --git a/Application/FileConverter/Properties/Resources.en.resx b/Application/FileConverter/Properties/Resources.en.resx index 47df71d..8546e67 100644 --- a/Application/FileConverter/Properties/Resources.en.resx +++ b/Application/FileConverter/Properties/Resources.en.resx @@ -484,4 +484,19 @@ use maj for uppercase version Unsupported output format '{0}'. + + Channel count : + + + Change the number of channels of the input file. + + + Mono + + + Same than input file + + + Stereo + \ No newline at end of file diff --git a/Application/FileConverter/Properties/Resources.resx b/Application/FileConverter/Properties/Resources.resx index 47df71d..8546e67 100644 --- a/Application/FileConverter/Properties/Resources.resx +++ b/Application/FileConverter/Properties/Resources.resx @@ -484,4 +484,19 @@ use maj for uppercase version Unsupported output format '{0}'. + + Channel count : + + + Change the number of channels of the input file. + + + Mono + + + Same than input file + + + Stereo + \ No newline at end of file diff --git a/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs b/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs index 9f467a3..16bf79e 100644 --- a/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs +++ b/Application/FileConverter/Windows/ConversionSettingsTemplateSelector.cs @@ -19,6 +19,12 @@ namespace FileConverter.Windows set; } + public DataTemplate FlacSettingsDataTemplate + { + get; + set; + } + public DataTemplate WavSettingsDataTemplate { get; @@ -102,6 +108,9 @@ namespace FileConverter.Windows case OutputType.Avi: return this.AviSettingsDataTemplate; + case OutputType.Flac: + return this.FlacSettingsDataTemplate; + case OutputType.Gif: return this.GifSettingsDataTemplate; diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml index ebc7b0a..c44a2dd 100644 --- a/Application/FileConverter/Windows/SettingsWindow.xaml +++ b/Application/FileConverter/Windows/SettingsWindow.xaml @@ -138,63 +138,132 @@ - - - + + - - - - - - - - - - + + + + + + + + + + - - + - - - + - - - + - + + + + + + + + + + + + + + @@ -390,7 +459,6 @@ - @@ -457,7 +525,6 @@ - @@ -633,6 +700,7 @@ DefaultDataTemplate="{StaticResource EmptyDataTemplate}" AacSettingsDataTemplate="{StaticResource AacSettingsDataTemplate}" AviSettingsDataTemplate="{StaticResource AviSettingsDataTemplate}" + FlacSettingsDataTemplate="{StaticResource FlacSettingsDataTemplate}" GifSettingsDataTemplate="{StaticResource GifSettingsDataTemplate}" JpgSettingsDataTemplate="{StaticResource JpgSettingsDataTemplate}" MkvSettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}"