diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs index 9c69669..86f7310 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_FFMPEG.cs @@ -86,10 +86,61 @@ namespace FileConverter.ConversionJobs string scaleArgs = string.Empty; if (Math.Abs(scaleFactor - 1f) >= 0.005f) { - scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture)); + scaleArgs = string.Format("scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture)); + } + + float rotationAngleInDegrees = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation); + string rotationArgs = string.Empty; + if (Math.Abs(rotationAngleInDegrees - 0f) >= 0.05f) + { + // Transpose: + // 0: 90 CounterClockwise and vertical flip + // 1: 90 Clockwise + // 2: 90 CounterClockwise + // 3: 90 Clockwise and vertical flip + if (Math.Abs(rotationAngleInDegrees - 90f) <= 0.05f) + { + rotationArgs = "transpose=2"; + } + else if (Math.Abs(rotationAngleInDegrees - 180f) <= 0.05f) + { + rotationArgs = "vflip,hflip"; + } + else if (Math.Abs(rotationAngleInDegrees - 270f) <= 0.05f) + { + rotationArgs = "transpose=1"; + } + else + { + Diagnostics.Debug.LogError("Unsupported rotation: {0}°", rotationAngleInDegrees); + } } - string encoderArgs = string.Format("-c:v mpeg4 -vtag xvid -qscale:v {0} -c:a libmp3lame -qscale:a {1} {2}", this.MPEG4QualityToQualityIndex(videoEncodingQuality), this.MP3VBRBitrateToQualityIndex(audioEncodingBitrate), scaleArgs); + // Build vf args (-vf "scale=..., transpose=...") + string vfArgs = string.Empty; + if (!string.IsNullOrEmpty(scaleArgs) || !string.IsNullOrEmpty(rotationArgs)) + { + vfArgs = "-vf \""; + if (!string.IsNullOrEmpty(scaleArgs)) + { + vfArgs += scaleArgs; + } + + if (!string.IsNullOrEmpty(rotationArgs)) + { + if (!string.IsNullOrEmpty(scaleArgs)) + { + vfArgs += ","; + } + + vfArgs += rotationArgs; + } + + vfArgs += "\""; + } + + // Compute final arguments. + string encoderArgs = string.Format("-c:v mpeg4 -vtag xvid -qscale:v {0} -c:a libmp3lame -qscale:a {1} {2}", this.MPEG4QualityToQualityIndex(videoEncodingQuality), this.MP3VBRBitrateToQualityIndex(audioEncodingBitrate), vfArgs); arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); } @@ -167,10 +218,60 @@ namespace FileConverter.ConversionJobs string scaleArgs = string.Empty; if (Math.Abs(scaleFactor - 1f) >= 0.005f) { - scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture)); + scaleArgs = string.Format("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} {3}", this.H264EncodingSpeedToPreset(videoEncodingSpeed), this.H264QualityToCRF(videoEncodingQuality), this.AACBitrateToQualityIndex(audioEncodingBitrate), scaleArgs); + float rotationAngleInDegrees = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoRotation); + string rotationArgs = string.Empty; + if (Math.Abs(rotationAngleInDegrees - 0f) >= 0.05f) + { + // Transpose: + // 0: 90 CounterClockwise and vertical flip + // 1: 90 Clockwise + // 2: 90 CounterClockwise + // 3: 90 Clockwise and vertical flip + if (Math.Abs(rotationAngleInDegrees - 90f) <= 0.05f) + { + rotationArgs = "transpose=2"; + } + else if (Math.Abs(rotationAngleInDegrees - 180f) <= 0.05f) + { + rotationArgs = "vflip,hflip"; + } + else if (Math.Abs(rotationAngleInDegrees - 270f) <= 0.05f) + { + rotationArgs = "transpose=1"; + } + else + { + Diagnostics.Debug.LogError("Unsupported rotation: {0}°", rotationAngleInDegrees); + } + } + + // Build vf args (-vf "scale=..., transpose=...") + string vfArgs = string.Empty; + if (!string.IsNullOrEmpty(scaleArgs) || !string.IsNullOrEmpty(rotationArgs)) + { + vfArgs = "-vf \""; + if (!string.IsNullOrEmpty(scaleArgs)) + { + vfArgs += scaleArgs; + } + + if (!string.IsNullOrEmpty(rotationArgs)) + { + if (!string.IsNullOrEmpty(scaleArgs)) + { + vfArgs += ","; + } + + vfArgs += rotationArgs; + } + + vfArgs += "\""; + } + + string encoderArgs = string.Format("-c:v libx264 -preset {0} -crf {1} -c:a aac -q:a {2} {3}", this.H264EncodingSpeedToPreset(videoEncodingSpeed), this.H264QualityToCRF(videoEncodingQuality), this.AACBitrateToQualityIndex(audioEncodingBitrate), vfArgs); arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs); } diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs index 60415a6..81f86c4 100644 --- a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs +++ b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs @@ -47,6 +47,14 @@ namespace FileConverter.ConversionJobs image.Scale(new Percentage(scaleFactor * 100f)); } + float rotateAngleInDegrees = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation); + if (Math.Abs(rotateAngleInDegrees - 0f) >= 0.05f) + { + Debug.Log("Apply rotation: {0}°.", rotateAngleInDegrees); + + image.Rotate(rotateAngleInDegrees); + } + bool clampSizeToPowerOf2 = this.ConversionPreset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2); if (clampSizeToPowerOf2) { diff --git a/Application/FileConverter/ConversionPreset/ConversionPreset.cs b/Application/FileConverter/ConversionPreset/ConversionPreset.cs index 9541f59..2c65a7b 100644 --- a/Application/FileConverter/ConversionPreset/ConversionPreset.cs +++ b/Application/FileConverter/ConversionPreset/ConversionPreset.cs @@ -414,6 +414,7 @@ namespace FileConverter case ConversionPreset.ConversionSettingKeys.AudioBitrate: case ConversionPreset.ConversionSettingKeys.VideoQuality: case ConversionPreset.ConversionSettingKeys.VideoScale: + case ConversionPreset.ConversionSettingKeys.VideoRotation: return true; } @@ -428,6 +429,7 @@ namespace FileConverter { case ConversionPreset.ConversionSettingKeys.ImageQuality: case ConversionPreset.ConversionSettingKeys.ImageScale: + case ConversionPreset.ConversionSettingKeys.ImageRotation: case ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2: return true; } @@ -440,6 +442,7 @@ namespace FileConverter case ConversionPreset.ConversionSettingKeys.AudioBitrate: case ConversionPreset.ConversionSettingKeys.VideoQuality: case ConversionPreset.ConversionSettingKeys.VideoScale: + case ConversionPreset.ConversionSettingKeys.VideoRotation: case ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed: return true; } @@ -462,6 +465,7 @@ namespace FileConverter case ConversionPreset.ConversionSettingKeys.AudioBitrate: case ConversionPreset.ConversionSettingKeys.VideoQuality: case ConversionPreset.ConversionSettingKeys.VideoScale: + case ConversionPreset.ConversionSettingKeys.VideoRotation: case ConversionPreset.ConversionSettingKeys.VideoEncodingSpeed: return true; } @@ -481,6 +485,7 @@ namespace FileConverter switch (settingsKey) { case ConversionPreset.ConversionSettingKeys.ImageScale: + case ConversionPreset.ConversionSettingKeys.ImageRotation: case ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2: case ConversionPreset.ConversionSettingKeys.ImageMaximumSize: return true; @@ -519,6 +524,7 @@ namespace FileConverter case OutputType.Png: this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0"); break; @@ -526,6 +532,7 @@ namespace FileConverter case OutputType.Jpg: this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "90"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1"); + this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageRotation, "0"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageClampSizePowerOf2, "False"); this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageMaximumSize, "0"); break; @@ -533,6 +540,7 @@ namespace FileConverter case OutputType.Avi: 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; @@ -540,6 +548,7 @@ namespace FileConverter 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; @@ -552,6 +561,7 @@ namespace FileConverter 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; @@ -717,11 +727,13 @@ namespace FileConverter public const string AudioBitrate = "AudioBitrate"; public const string ImageQuality = "ImageQuality"; public const string ImageScale = "ImageScale"; + public const string ImageRotation = "ImageRotation"; public const string ImageClampSizePowerOf2 = "ImageClampSizePowerOf2"; public const string ImageMaximumSize = "ImageMaximumSize"; public const string VideoQuality = "VideoQuality"; public const string VideoEncodingSpeed = "VideoEncodingSpeed"; public const string VideoScale = "VideoScale"; + public const string VideoRotation = "VideoRotation"; } } } diff --git a/Application/FileConverter/Properties/Resources.Designer.cs b/Application/FileConverter/Properties/Resources.Designer.cs index a087daf..26a4836 100644 --- a/Application/FileConverter/Properties/Resources.Designer.cs +++ b/Application/FileConverter/Properties/Resources.Designer.cs @@ -60,6 +60,24 @@ namespace FileConverter.Properties { } } + /// + /// Looks up a localized string similar to 90° counter clockwise rotation. + /// + public static string NinetyDegreesRotationTooltip { + get { + return ResourceManager.GetString("NinetyDegreesRotationTooltip", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 180° rotation. + /// + public static string OneEightyDegreesRotationTooltip { + get { + return ResourceManager.GetString("OneEightyDegreesRotationTooltip", resourceCulture); + } + } + /// /// Looks up a localized string similar to C:\Music\Artist\Album\Song.wav. /// @@ -91,6 +109,15 @@ namespace FileConverter.Properties { } } + /// + /// Looks up a localized string similar to 90° clockwise rotation. + /// + public static string TwoSeventyDegreesRotationTooltip { + get { + return ResourceManager.GetString("TwoSeventyDegreesRotationTooltip", resourceCulture); + } + } + /// /// Looks up a localized string similar to Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality.. /// @@ -108,5 +135,14 @@ namespace FileConverter.Properties { return ResourceManager.GetString("VideoEncodingSpeedTooltip", resourceCulture); } } + + /// + /// Looks up a localized string similar to No rotation. + /// + public static string ZeroDegreesRotationTooltip { + get { + return ResourceManager.GetString("ZeroDegreesRotationTooltip", resourceCulture); + } + } } } diff --git a/Application/FileConverter/Properties/Resources.en.resx b/Application/FileConverter/Properties/Resources.en.resx index 793af64..b3bfa2f 100644 --- a/Application/FileConverter/Properties/Resources.en.resx +++ b/Application/FileConverter/Properties/Resources.en.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 90° counter clockwise rotation + + + 180° rotation + C:\Music\Artist\Album\Song.wav @@ -136,10 +142,16 @@ Special paths: (p:v): my videos path (p:p): my pictures path + + 90° clockwise rotation + Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality. Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression. + + No rotation + \ No newline at end of file diff --git a/Application/FileConverter/Properties/Resources.resx b/Application/FileConverter/Properties/Resources.resx index 793af64..b3bfa2f 100644 --- a/Application/FileConverter/Properties/Resources.resx +++ b/Application/FileConverter/Properties/Resources.resx @@ -117,6 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 90° counter clockwise rotation + + + 180° rotation + C:\Music\Artist\Album\Song.wav @@ -136,10 +142,16 @@ Special paths: (p:v): my videos path (p:p): my pictures path + + 90° clockwise rotation + Define the ratio 'file size' versus 'video quality'. A lower value will give you a smaller file, a greater value give you a better video quality. Define the ratio 'file size' versus 'compression duration'. A slow compression will give you a smaller file (for the same video quality) than a faster compression. + + No rotation + \ No newline at end of file diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml index 2a02633..939721b 100644 --- a/Application/FileConverter/Windows/SettingsWindow.xaml +++ b/Application/FileConverter/Windows/SettingsWindow.xaml @@ -122,6 +122,7 @@ + @@ -133,6 +134,7 @@ + - + +