QSV WinGui: Updated Preset / advanced String. Disable Two Pass encoding for QSV.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/qsv@5443 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
index e8180e0a12dab0762a84557f2ab260349a06b970..75fd00554adb67df6c6b54b9de9046d9d27d1f77 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
@@ -530,12 +530,14 @@ namespace HandBrake.ApplicationServices.Services
             preset.Task.VideoEncoder = VideoEncoder.QuickSync;\r
             preset.Task.Quality = 20;\r
             preset.Task.AdvancedEncoderOptions =\r
-                "num-ref-frame=3:gop-ref-dist=5:gop-pic-size=5:async-depth=4";\r
+                "gop-ref-dist=4:gop-pic-size=32:async-depth=4";\r
             preset.Task.AudioTracks = new ObservableCollection<AudioTrack>();\r
             preset.Task.AudioTracks.Add(new AudioTrack { Bitrate = 160, Encoder = AudioEncoder.Faac, MixDown = Mixdown.DolbyProLogicII});\r
             preset.Task.Anamorphic = Anamorphic.Loose;\r
-            preset.Task.QsvPreset = QsvPreset.Balanced;\r
+            preset.Task.QsvPreset = QsvPreset.Quality;\r
             preset.Task.FramerateMode = FramerateMode.CFR;\r
+            preset.Task.TwoPass = false;\r
+            preset.Task.TurboFirstPass = false;\r
             preset.Task.OutputFormat = OutputFormat.Mp4;\r
             preset.Task.VideoEncodeRateType = VideoEncodeRateType.ConstantQuality;\r
             \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index ff691cec4cf7cfff553e8e37559c693255813052..ca4e1ecee2703bdaa98607ed8574ad3378656486 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -119,7 +119,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>\r
         /// The display framerate controls.\r
         /// </summary>\r
-        private bool displayFramerateControls;\r
+        private bool displayNonQSVControls;\r
 \r
         #endregion\r
 \r
@@ -407,6 +407,40 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether two pass.\r
+        /// </summary>\r
+        public bool TwoPass\r
+        {\r
+            get\r
+            {\r
+                return this.Task.TwoPass;\r
+            }\r
+\r
+            set\r
+            {\r
+                this.Task.TwoPass = value;\r
+                this.NotifyOfPropertyChange(() => this.TwoPass);\r
+            }\r
+        }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether turbo first pass.\r
+        /// </summary>\r
+        public bool TurboFirstPass\r
+        {\r
+            get\r
+            {\r
+                return this.Task.TurboFirstPass;\r
+            }\r
+\r
+            set\r
+            {\r
+                this.Task.TurboFirstPass = value;\r
+                this.NotifyOfPropertyChange(() => this.TurboFirstPass);\r
+            }\r
+        }\r
+\r
         /// <summary>\r
         /// Gets the rfqp.\r
         /// </summary>\r
@@ -485,7 +519,7 @@ namespace HandBrakeWPF.ViewModels
                 this.DisplayQSVOptions = value == VideoEncoder.QuickSync;\r
                 this.DisplayH264Options = value == VideoEncoder.X264 || value == VideoEncoder.QuickSync;\r
                 this.UseAdvancedTab = value != VideoEncoder.QuickSync && this.UseAdvancedTab;\r
-                this.DisplayFramerateControls = value != VideoEncoder.QuickSync;\r
+                this.DisplayNonQSVControls = value != VideoEncoder.QuickSync;\r
 \r
                 this.NotifyOfPropertyChange(() => this.Rfqp);\r
                 this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);\r
@@ -493,6 +527,8 @@ namespace HandBrakeWPF.ViewModels
                 if (value == VideoEncoder.QuickSync)\r
                 {\r
                     this.IsConstantFramerate = true;\r
+                    this.TwoPass = false;\r
+                    this.TurboFirstPass = false;\r
                 }\r
             }\r
         }\r
@@ -590,17 +626,17 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>\r
         /// Gets or sets a value indicating whether display framerate controls.\r
         /// </summary>\r
-        public bool DisplayFramerateControls\r
+        public bool DisplayNonQSVControls\r
         {\r
             get\r
             {\r
-                return this.displayFramerateControls;\r
+                return this.displayNonQSVControls;\r
             }\r
 \r
             set\r
             {\r
-                this.displayFramerateControls = value;\r
-                this.NotifyOfPropertyChange(() => this.DisplayFramerateControls);\r
+                this.displayNonQSVControls = value;\r
+                this.NotifyOfPropertyChange(() => this.DisplayNonQSVControls);\r
             }\r
         }\r
 \r

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index cda7bddac749dd76b06d51d2e1806157b83c9005..651b0ffe44c1200fd61605a6beaefc137cedba89 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -75,7 +75,7 @@
                     <StackPanel Orientation="Vertical">\r
                         <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" />\r
 \r
-                        <StackPanel Orientation="Vertical" Visibility="{Binding DisplayFramerateControls, Converter={StaticResource boolToVisConverter}}">\r
+                        <StackPanel Orientation="Vertical" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">\r
                             <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" Margin="0,10,0,0" />\r
                             <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" \r
                                      Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
@@ -109,11 +109,11 @@
                     <TextBox Width="75" Text="{Binding Task.VideoBitrate, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />\r
                 </StackPanel>\r
 \r
-                <StackPanel Orientation="Horizontal" Margin="30,0,0,0">\r
+                <StackPanel Orientation="Horizontal" Margin="30,0,0,0" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">\r
                     <CheckBox Content="2-Pass Encoding" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"\r
-                              IsChecked="{Binding Task.TwoPass}" Margin="0,0,10,0" />\r
+                              IsChecked="{Binding TwoPass}" Margin="0,0,10,0" />\r
                     <CheckBox Content="Turbo first pass" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"\r
-                              IsChecked="{Binding Task.TurboFirstPass}" />\r
+                              IsChecked="{Binding TurboFirstPass}" />\r
                 </StackPanel>\r
 \r
             </StackPanel>\r