Add: scale ratio option on image conversion presets (jpg/png).

This commit is contained in:
Tichau committed 2016-01-08 18:42:02 +01:00
1 parent 34138ef00c
commit 250ec2f7d3
6 files changed
+141 -12

No files matched your search

@@ -4,6 +4,7 @@ namespace FileConverter.ConversionJobs
{
using System;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Text.RegularExpressions;
@@ -132,8 +133,16 @@ namespace FileConverter.ConversionJobs
case OutputType.Png:
{
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
string scaleArgs = string.Empty;
if (Math.Abs(scaleFactor - 1f) >= 0.005f)
{
scaleArgs = string.Format("-vf scale=iw*{0}:ih*{0}", scaleFactor.ToString("#.##", CultureInfo.InvariantCulture));
}
// http://www.howtogeek.com/203979/is-the-png-format-lossless-since-it-has-a-compression-parameter/
string encoderArgs = string.Format("-compression_level 100");
string encoderArgs = string.Format("-compression_level 100 {0}", scaleArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
}
@@ -142,7 +151,16 @@ namespace FileConverter.ConversionJobs
case OutputType.Jpg:
{
int encodingQuality = this.ConversionPreset.GetSettingsValue<int>(ConversionPreset.ConversionSettingKeys.ImageQuality);
string encoderArgs = string.Format("-q:v {0}", this.JPGQualityToQualityIndex(encodingQuality));
float scaleFactor = this.ConversionPreset.GetSettingsValue<float>(ConversionPreset.ConversionSettingKeys.ImageScale);
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("-q:v {0} {1}", this.JPGQualityToQualityIndex(encodingQuality), scaleArgs);
arguments = string.Format("-n -stats -i \"{0}\" {2} \"{1}\"", this.InputFilePath, this.OutputFilePath, encoderArgs);
}
@@ -436,6 +436,16 @@ namespace FileConverter
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.ImageQuality:
case ConversionPreset.ConversionSettingKeys.ImageScale:
return true;
}
break;
case OutputType.Png:
switch (settingsKey)
{
case ConversionPreset.ConversionSettingKeys.ImageScale:
return true;
}
@@ -453,13 +463,17 @@ namespace FileConverter
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.AudioBitrate, "128");
break;
case OutputType.Flac:
case OutputType.Ico:
case OutputType.Flac:
break;
case OutputType.Png:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
break;
case OutputType.Jpg:
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageQuality, "25");
this.InitializeSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, "1");
break;
case OutputType.Mkv:
@@ -634,6 +648,7 @@ namespace FileConverter
public const string AudioEncodingMode = "AudioEncodingMode";
public const string AudioBitrate = "AudioBitrate";
public const string ImageQuality = "ImageQuality";
public const string ImageScale = "ImageScale";
public const string VideoQuality = "VideoQuality";
public const string VideoEncodingSpeed = "VideoEncodingSpeed";
}
@@ -117,6 +117,7 @@
<Compile Include="ValueConverters\Generic\DoubleToTimeString.cs" />
<Compile Include="ValueConverters\Generic\EqualsConverter.cs" />
<Compile Include="ValueConverters\Generic\CollectionContainsElementToBool.cs" />
<Compile Include="ValueConverters\Generic\FormatStringConverter.cs" />
<Compile Include="ValueConverters\Generic\StringToValueType.cs" />
<Compile Include="ValueConverters\InputTypesToBool.cs" />
<Compile Include="Settings.cs" />
@@ -0,0 +1,32 @@
// <copyright file="CollectionContainsElementToBool.cs" company="AAllard">License: http://www.gnu.org/licenses/gpl.html GPL version 3.</copyright>
namespace FileConverter.ValueConverters.Generic
{
using System;
using System.Globalization;
using System.Windows.Data;
public class FormatStringConverter : IMultiValueConverter
{
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
if (values == null)
{
throw new ArgumentException("The values must not be null.");
}
string format = parameter as string;
if (format == null)
{
return string.Empty;
}
return string.Format(format, values);
}
public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
@@ -42,6 +42,12 @@ namespace FileConverter.Windows
get;
set;
}
public DataTemplate PngSettingsDataTemplate
{
get;
set;
}
public DataTemplate MkvSettingsDataTemplate
{
@@ -77,6 +83,9 @@ namespace FileConverter.Windows
case OutputType.Jpg:
return this.JpgSettingsDataTemplate;
case OutputType.Png:
return this.PngSettingsDataTemplate;
}
return this.DefaultDataTemplate;
@@ -17,6 +17,7 @@
<generic:BoolToVisibility x:Key="BoolToVisibility"/>
<valueConverters:ApplicationVersionToApplicationName x:Key="ApplicationVersionToApplicationName"/>
<generic:CollectionContainsElementToBool x:Key="CollectionContainsElementToBool"/>
<generic:FormatStringConverter x:Key="FormatStringConverter"/>
<generic:ValueConverterGroup x:Key="ConversionSettingsToEnum">
<valueConverters:ConversionSettingsToString/>
@@ -151,13 +152,66 @@
<DataTemplate x:Key="JpgSettingsDataTemplate">
<StackPanel>
<DockPanel>
<Label Content="Quality :" />
<Slider x:Name="QualitySlider" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=25}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="30" Minimum="0" Maximum="30" TickPlacement="BottomRight" SmallChange="3" LargeChange="6" TickFrequency="1" Foreground="#004B82" />
</DockPanel>
</StackPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--Quality-->
<Label Content="Quality :" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
<Slider Grid.Row="0" Grid.Column="1" x:Name="QualitySlider" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageQuality|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay, TargetNullValue=25}"
Margin="0,2,0,0" VerticalAlignment="Top" AutoToolTipPlacement="TopLeft" IsSnapToTickEnabled="True" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="30" Minimum="0" Maximum="30" TickPlacement="BottomRight" SmallChange="3" LargeChange="6" TickFrequency="1" Foreground="#004B82" />
<!--Scale-->
<Label Content="Scale :" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="1" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.01" Maximum="2" SmallChange="0.01" LargeChange="0.1" TickFrequency="0.01" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P0}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
</Grid>
</Grid>
</DataTemplate>
<DataTemplate x:Key="PngSettingsDataTemplate">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!--Scale-->
<Label Content="Scale :" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right"/>
<Grid Grid.Row="0" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions>
<Slider x:Name="ScaleSlider" Grid.Column="0" Value="{Binding SelectedPreset.Settings, ConverterParameter=ImageScale|System.Double, Converter={StaticResource ConversionSettingsToValueType}, ElementName=window, Mode=TwoWay}" Margin="0,2,0,0" VerticalAlignment="Top" IsSnapToTickEnabled="True" Minimum="0.01" Maximum="2" SmallChange="0.01" LargeChange="0.1" TickFrequency="0.01" Foreground="#004B82"/>
<Label Grid.Column="1">
<Label.Content>
<MultiBinding Converter="{StaticResource FormatStringConverter}" Mode="OneWay">
<MultiBinding.ConverterParameter>{0:P0}</MultiBinding.ConverterParameter>
<Binding ElementName="ScaleSlider" Path="Value" Mode="OneWay"/>
</MultiBinding>
</Label.Content>
</Label>
</Grid>
</Grid>
</DataTemplate>
<windows:ConversionSettingsTemplateSelector x:Key="ConversionSettingsSelector"
@@ -167,7 +221,8 @@
OggSettingsDataTemplate="{StaticResource OggSettingsDataTemplate}"
MkvSettingsDataTemplate="{StaticResource MkvSettingsDataTemplate}"
AacSettingsDataTemplate="{StaticResource AacSettingsDataTemplate}"
JpgSettingsDataTemplate="{StaticResource JpgSettingsDataTemplate}" />
JpgSettingsDataTemplate="{StaticResource JpgSettingsDataTemplate}"
PngSettingsDataTemplate="{StaticResource PngSettingsDataTemplate}" />
</Window.Resources>
<Window.Title>
<Binding Converter="{StaticResource ApplicationVersionToApplicationName}" Mode="OneWay" Path="(local:Application.ApplicationVersion)"/>
@@ -354,6 +409,5 @@
<Button x:Name="CloseButton" Grid.Row="3" Content="Close" HorizontalAlignment="Right" Width="100" Margin="0,4,105,0" Click="CloseButton_Click" />
<Button x:Name="SaveButton" Grid.Row="3" Content="Save" HorizontalAlignment="Right" Width="100" Margin="0,4,0,0" Click="SaveButton_Click" Command="New"/>
</Grid>
</Window>