diff options
| author | sr55 <[email protected]> | 2013-08-23 13:20:38 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-08-23 13:20:38 +0000 |
| commit | c7dc884bbee9c87fb4e7eb974d5ee029f4c234e4 (patch) | |
| tree | 9775daec15adcc3c39b957e9dd37e858b5a2cbf1 /win/CS/HandBrake.Interop | |
| parent | 1270ebc49fc8dc11ea509815094faacfa8338834 (diff) | |
WinGui: Manually merged the QuickSync UI changes from the qsv branch to trunk
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5741 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.Interop')
3 files changed, 32 insertions, 0 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj index d213ca39a..047a172e6 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj @@ -166,6 +166,7 @@ <Compile Include="Model\Encoding\Mixdown.cs" />
<Compile Include="Model\Encoding\OutputExtension.cs" />
<Compile Include="Model\Encoding\Container.cs" />
+ <Compile Include="Model\Encoding\QsvPreset.cs" />
<Compile Include="Model\Encoding\VideoEncoder.cs" />
<Compile Include="Model\Encoding\VideoEncodeRateType.cs" />
<Compile Include="Model\Encoding\x264\x264Preset.cs" />
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/QsvPreset.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/QsvPreset.cs new file mode 100644 index 000000000..08147a5d3 --- /dev/null +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/QsvPreset.cs @@ -0,0 +1,28 @@ +// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QsvPreset.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The qsv preset.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+ using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The qsv preset.
+ /// </summary>
+ public enum QsvPreset
+ {
+ [Display(Name = "Best Speed")]
+ Speed,
+
+ [Display(Name = "Balanced")]
+ Balanced,
+
+ [Display(Name = "Best Quality")]
+ Quality,
+ }
+}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs index e05f74419..b355d5038 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs @@ -22,6 +22,9 @@ namespace HandBrake.Interop.Model.Encoding [ShortName("x264")]
X264 = 0,
+ [Display(Name = "H.264 (Intel QSV)")]
+ QuickSync,
+
[Display(Name = "MPEG-4 (FFmpeg)")]
[ShortName("mpeg4")]
FFMpeg,
|