diff options
| author | sr55 <[email protected]> | 2013-06-01 13:00:11 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-06-01 13:00:11 +0000 |
| commit | 665b3364b361897b572bfafb80e36a993668a943 (patch) | |
| tree | 0ee878235aa202b9493dc38ef1ca45763c1fa159 | |
| parent | dc0c09c0def611964fd22951ce50e6b0cbc7f48f (diff) | |
WinGui: Add support for the 24bit flac encoder.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5537 b64f7644-9d1e-0410-96f1-a4d463321fa5
3 files changed, 16 insertions, 3 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs index 39b601a27..8ac89c0ee 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs @@ -185,7 +185,9 @@ namespace HandBrake.ApplicationServices.Utilities case "ffaac":
return "AAC (ffmpeg)";
case "ffflac":
- return "Flac (ffmpeg)";
+ return "FLAC (ffmpeg)";
+ case "ffflac24":
+ return "FLAC (24-bit)";
case "copy":
return "Auto Passthru";
default:
@@ -214,6 +216,8 @@ namespace HandBrake.ApplicationServices.Utilities return AudioEncoder.Ac3;
case "ffflac":
return AudioEncoder.ffflac;
+ case "ffflac24":
+ return AudioEncoder.ffflac24;
case "copy:ac3":
return AudioEncoder.Ac3Passthrough;
case "copy:dts":
@@ -262,8 +266,10 @@ namespace HandBrake.ApplicationServices.Utilities return AudioEncoder.AacPassthru;
case "MP3 Passthru":
return AudioEncoder.Mp3Passthru;
- case "Flac (ffmpeg)":
+ case "FLAC (ffmpeg)":
return AudioEncoder.ffflac;
+ case "FLAC (24-bit)":
+ return AudioEncoder.ffflac24;
case "Auto Passthru":
return AudioEncoder.Passthrough;
default:
@@ -288,6 +294,7 @@ namespace HandBrake.ApplicationServices.Utilities return "faac";
case AudioEncoder.ffaac:
return "ffaac";
+
case AudioEncoder.Lame:
return "lame";
case AudioEncoder.Vorbis:
@@ -308,6 +315,8 @@ namespace HandBrake.ApplicationServices.Utilities return "copy";
case AudioEncoder.ffflac:
return "ffflac";
+ case AudioEncoder.ffflac24:
+ return "ffflac24";
default:
return "faac";
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs index c8877e6d6..8fb242ac6 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs @@ -49,7 +49,10 @@ namespace HandBrake.Interop.Model.Encoding [Display(Name = "Vorbis (vorbis)")]
Vorbis,
- [Display(Name = "Flac (ffmpeg)")]
+ [Display(Name = "FLAC (ffmpeg)")]
ffflac,
+
+ [Display(Name = "FLAC (24-bit)")]
+ ffflac24,
}
}
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs index 061dbd6e8..1db7a7c0a 100644 --- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs @@ -55,6 +55,7 @@ namespace HandBrakeWPF.Converters.Audio {
encoders.Remove(AudioEncoder.Vorbis);
encoders.Remove(AudioEncoder.ffflac);
+ encoders.Remove(AudioEncoder.ffflac24);
}
if (parameter != null && parameter.ToString() == "True")
|