修改ApngPred属性名为PredMethod
This commit is contained in:
@@ -62,8 +62,8 @@ namespace Spine.Exporters
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// [Apng] 预测器算法, 取值范围 0-5, 分别对应 none, sub, up, avg, paeth, mixed
|
/// [Apng] 预测器算法, 取值范围 0-5, 分别对应 none, sub, up, avg, paeth, mixed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int ApngPred { get => _apngPred; set => _apngPred = Math.Clamp(value, 0, 5); }
|
public int PredMethod { get => _predMethod; set => _predMethod = Math.Clamp(value, 0, 5); }
|
||||||
private int _apngPred = 5;
|
private int _predMethod = 5;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// [Mp4/Webm/Mkv] CRF
|
/// [Mp4/Webm/Mkv] CRF
|
||||||
@@ -142,7 +142,7 @@ namespace Spine.Exporters
|
|||||||
|
|
||||||
private void SetApngOptions(FFMpegArgumentOptions options)
|
private void SetApngOptions(FFMpegArgumentOptions options)
|
||||||
{
|
{
|
||||||
var customArgs = $"-vf unpremultiply=inplace=1 -plays {(_loop ? 0 : 1)} -pred {_apngPred}";
|
var customArgs = $"-vf unpremultiply=inplace=1 -plays {(_loop ? 0 : 1)} -pred {_predMethod}";
|
||||||
options.ForceFormat("apng").WithVideoCodec("apng").ForcePixelFormat("rgba")
|
options.ForceFormat("apng").WithVideoCodec("apng").ForcePixelFormat("rgba")
|
||||||
.WithCustomArgument(customArgs);
|
.WithCustomArgument(customArgs);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -206,8 +206,8 @@
|
|||||||
<s:String x:Key="Str_QualityParameterTooltip" xml:space="preserve">[Webp]
Quality parameter, range 0-100, higher value means better quality</s:String>
|
<s:String x:Key="Str_QualityParameterTooltip" xml:space="preserve">[Webp]
Quality parameter, range 0-100, higher value means better quality</s:String>
|
||||||
<s:String x:Key="Str_LosslessParam">Lossless Compression</s:String>
|
<s:String x:Key="Str_LosslessParam">Lossless Compression</s:String>
|
||||||
<s:String x:Key="Str_LosslessParamTooltip" xml:space="preserve">[Webp]
Lossless compression, quality parameter will be ignored</s:String>
|
<s:String x:Key="Str_LosslessParamTooltip" xml:space="preserve">[Webp]
Lossless compression, quality parameter will be ignored</s:String>
|
||||||
<s:String x:Key="Str_ApngPred">Predictor Method</s:String>
|
<s:String x:Key="Str_PredMethod">Predictor Method</s:String>
|
||||||
<s:String x:Key="Str_ApngPredTooltip" xml:space="preserve">[Apng]
Pred parameter, value range 0-5, corresponding to different encoding strategies: none, sub, up, avg, paeth, and mixed.
It affects encoding time and file size.</s:String>
|
<s:String x:Key="Str_PredMethodTooltip" xml:space="preserve">[Apng]
Pred parameter, value range 0-5, corresponding to different encoding strategies: none, sub, up, avg, paeth, and mixed.
It affects encoding time and file size.</s:String>
|
||||||
<s:String x:Key="Str_CrfParameter">CRF Parameter</s:String>
|
<s:String x:Key="Str_CrfParameter">CRF Parameter</s:String>
|
||||||
<s:String x:Key="Str_CrfParameterTooltip" xml:space="preserve">[Mp4/Webm/Mkv]
CRF parameter, range 0-63, lower value means higher quality</s:String>
|
<s:String x:Key="Str_CrfParameterTooltip" xml:space="preserve">[Mp4/Webm/Mkv]
CRF parameter, range 0-63, lower value means higher quality</s:String>
|
||||||
<s:String x:Key="Str_ProfileParameter">Profile Parameter</s:String>
|
<s:String x:Key="Str_ProfileParameter">Profile Parameter</s:String>
|
||||||
|
|||||||
@@ -206,8 +206,8 @@
|
|||||||
<s:String x:Key="Str_QualityParameterTooltip" xml:space="preserve">[Webp]
品質パラメータ、範囲は0-100。値が高いほど品質が良い</s:String>
|
<s:String x:Key="Str_QualityParameterTooltip" xml:space="preserve">[Webp]
品質パラメータ、範囲は0-100。値が高いほど品質が良い</s:String>
|
||||||
<s:String x:Key="Str_LosslessParam">無損失圧縮</s:String>
|
<s:String x:Key="Str_LosslessParam">無損失圧縮</s:String>
|
||||||
<s:String x:Key="Str_LosslessParamTooltip" xml:space="preserve">[Webp]
無損失圧縮、品質パラメータは無視されます</s:String>
|
<s:String x:Key="Str_LosslessParamTooltip" xml:space="preserve">[Webp]
無損失圧縮、品質パラメータは無視されます</s:String>
|
||||||
<s:String x:Key="Str_ApngPred">予測器方式</s:String>
|
<s:String x:Key="Str_PredMethod">予測器方式</s:String>
|
||||||
<s:String x:Key="Str_ApngPredTooltip" xml:space="preserve">[Apng]
Pred パラメータ。値の範囲は 0~5 で、それぞれ none、sub、up、avg、paeth、mixed の異なるエンコード方式に対応します。
エンコード時間とファイルサイズに影響します。</s:String>
|
<s:String x:Key="Str_PredMethodTooltip" xml:space="preserve">[Apng]
Pred パラメータ。値の範囲は 0~5 で、それぞれ none、sub、up、avg、paeth、mixed の異なるエンコード方式に対応します。
エンコード時間とファイルサイズに影響します。</s:String>
|
||||||
<s:String x:Key="Str_CrfParameter">CRF パラメータ</s:String>
|
<s:String x:Key="Str_CrfParameter">CRF パラメータ</s:String>
|
||||||
<s:String x:Key="Str_CrfParameterTooltip" xml:space="preserve">[Mp4/Webm/Mkv]
CRF パラメータ、範囲0-63。値が小さいほど品質が高い</s:String>
|
<s:String x:Key="Str_CrfParameterTooltip" xml:space="preserve">[Mp4/Webm/Mkv]
CRF パラメータ、範囲0-63。値が小さいほど品質が高い</s:String>
|
||||||
<s:String x:Key="Str_ProfileParameter">プロファイルパラメータ</s:String>
|
<s:String x:Key="Str_ProfileParameter">プロファイルパラメータ</s:String>
|
||||||
|
|||||||
@@ -206,8 +206,8 @@
|
|||||||
<s:String x:Key="Str_QualityParameterTooltip" xml:space="preserve">[Webp]
质量参数,取值范围 0-100,越高质量越好</s:String>
|
<s:String x:Key="Str_QualityParameterTooltip" xml:space="preserve">[Webp]
质量参数,取值范围 0-100,越高质量越好</s:String>
|
||||||
<s:String x:Key="Str_LosslessParam">无损压缩</s:String>
|
<s:String x:Key="Str_LosslessParam">无损压缩</s:String>
|
||||||
<s:String x:Key="Str_LosslessParamTooltip" xml:space="preserve">[Webp]
无损压缩,会忽略质量参数</s:String>
|
<s:String x:Key="Str_LosslessParamTooltip" xml:space="preserve">[Webp]
无损压缩,会忽略质量参数</s:String>
|
||||||
<s:String x:Key="Str_ApngPred">预测器方法</s:String>
|
<s:String x:Key="Str_PredMethod">预测器方法</s:String>
|
||||||
<s:String x:Key="Str_ApngPredTooltip" xml:space="preserve">[Apng]
Pred 参数,取值范围 0-5,分别对应 none、sub、up、avg、paeth、mixed 几种不同的编码策略,
影响编码时间和文件大小</s:String>
|
<s:String x:Key="Str_PredMethodTooltip" xml:space="preserve">[Apng]
Pred 参数,取值范围 0-5,分别对应 none、sub、up、avg、paeth、mixed 几种不同的编码策略,
影响编码时间和文件大小</s:String>
|
||||||
<s:String x:Key="Str_CrfParameter">CRF 参数</s:String>
|
<s:String x:Key="Str_CrfParameter">CRF 参数</s:String>
|
||||||
<s:String x:Key="Str_CrfParameterTooltip" xml:space="preserve">[Mp4/Webm/Mkv]
CRF 参数,取值范围 0-63,越小质量越高</s:String>
|
<s:String x:Key="Str_CrfParameterTooltip" xml:space="preserve">[Mp4/Webm/Mkv]
CRF 参数,取值范围 0-63,越小质量越高</s:String>
|
||||||
<s:String x:Key="Str_ProfileParameter">Profile 参数</s:String>
|
<s:String x:Key="Str_ProfileParameter">Profile 参数</s:String>
|
||||||
|
|||||||
@@ -57,8 +57,8 @@ namespace SpineViewer.ViewModels.Exporters
|
|||||||
public bool EnableParamLossless =>
|
public bool EnableParamLossless =>
|
||||||
_format == FFmpegVideoExporter.VideoFormat.Webp;
|
_format == FFmpegVideoExporter.VideoFormat.Webp;
|
||||||
|
|
||||||
public int ApngPred { get => _apngPred; set => SetProperty(ref _apngPred, Math.Clamp(value, 0, 5)); }
|
public int PredMethod { get => _predMethod; set => SetProperty(ref _predMethod, Math.Clamp(value, 0, 5)); }
|
||||||
protected int _apngPred = 5;
|
protected int _predMethod = 5;
|
||||||
|
|
||||||
public bool EnableParamApngPred =>
|
public bool EnableParamApngPred =>
|
||||||
_format == FFmpegVideoExporter.VideoFormat.Apng;
|
_format == FFmpegVideoExporter.VideoFormat.Apng;
|
||||||
@@ -102,7 +102,7 @@ namespace SpineViewer.ViewModels.Exporters
|
|||||||
Loop = _loop,
|
Loop = _loop,
|
||||||
Quality = _quality,
|
Quality = _quality,
|
||||||
Lossless = _lossless,
|
Lossless = _lossless,
|
||||||
ApngPred = _apngPred,
|
PredMethod = _predMethod,
|
||||||
Crf = _crf,
|
Crf = _crf,
|
||||||
Profile = _profile,
|
Profile = _profile,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -247,8 +247,8 @@
|
|||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
|
<ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
|
||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Label Content="{DynamicResource Str_ApngPred}" ToolTip="{DynamicResource Str_ApngPredTooltip}"/>
|
<Label Content="{DynamicResource Str_PredMethod}" ToolTip="{DynamicResource Str_PredMethodTooltip}"/>
|
||||||
<TextBox Grid.Column="1" Text="{Binding ApngPred}" ToolTip="{DynamicResource Str_ApngPredTooltip}"/>
|
<TextBox Grid.Column="1" Text="{Binding PredMethod}" ToolTip="{DynamicResource Str_PredMethodTooltip}"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<!-- CRF 参数 -->
|
<!-- CRF 参数 -->
|
||||||
|
|||||||
Reference in New Issue
Block a user