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

1 files changed, 7 insertions, 0 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 9e57ef03a..87ddadd43 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -46,6 +46,7 @@ namespace HandBrake.ApplicationServices.Model
             this.ChapterNames = new ObservableCollection<ChapterMarker>();

             this.AllowedPassthruOptions = new AllowedPassthru();

             this.X264Preset = x264Preset.Medium;

+            this.QsvPreset = QsvPreset.Quality;

             this.H264Profile = x264Profile.None;

             this.X264Tune = x264Tune.None;

             this.Modulus = 16;

@@ -126,6 +127,7 @@ namespace HandBrake.ApplicationServices.Model
             this.VideoEncodeRateType = task.VideoEncodeRateType;

             this.Width = task.Width;

             this.X264Preset = task.X264Preset;

+            this.QsvPreset = task.QsvPreset;

             this.H264Profile = task.H264Profile;

             this.X264Tune = task.X264Tune;

             this.H264Level = task.H264Level;

@@ -418,6 +420,11 @@ namespace HandBrake.ApplicationServices.Model
         public x264Preset X264Preset { get; set; }

 

         /// <summary>

+        /// Gets or sets the qsv preset.

+        /// </summary>

+        public QsvPreset QsvPreset { get; set; }

+

+        /// <summary>

         /// Gets or sets x264Profile.

         /// </summary>

         public x264Profile H264Profile { get; set; }