WinGui: Make the QSV Decoding options clearer.

diff --git a/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs b/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs
index f8b2eb69f74a60381dc214914d35ff648d1cbea0..fd8c97ea35d3e6b0af3cb348c1e255db4f2f9cbb 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs
@@ -22,7 +22,7 @@ namespace HandBrake.ApplicationServices.Model
         /// <summary>\r
         /// Gets or sets a value indicating whether disable quick sync decoding.\r
         /// </summary>\r
-        public bool DisableQuickSyncDecoding { get; set; }\r
+        public bool EnableQuickSyncDecoding { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets a value indicating whether use qsv decode for non qsv enc.\r

diff --git a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
index dc3fa198358b5fcce2d6deb2749573c21312f2c5..d6ac2f7f58e15afd57079f94d6c50619d3ff7bc8 100644 (file)
--- a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
+++ b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
@@ -35,8 +35,8 @@ namespace HandBrakeWPF.Factories
         {\r
             HBConfiguration config = new HBConfiguration\r
                                          {\r
-                                             IsDvdNavDisabled = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav), \r
-                                             DisableQuickSyncDecoding = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding), \r
+                                             IsDvdNavDisabled = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav),\r
+                                             EnableQuickSyncDecoding = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncDecoding), \r
                                              UseQSVDecodeForNonQSVEnc = UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseQSVDecodeForNonQSVEnc),\r
                                              ScalingMode = UserSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode), \r
                                              PreviewScanCount = UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount), \r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 5bafddb3e59186814c1f88a47fbe71103bf26d4b..d40aa4e0a1caddf2af2dd6536fdf1972b2730d62 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1465,7 +1465,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Disable QuickSync Decoding.\r
+        ///   Looks up a localized string similar to Enable QuickSync Decoding.\r
         /// </summary>\r
         public static string Options_QsvDecode {\r
             get {\r
@@ -1474,7 +1474,7 @@ namespace HandBrakeWPF.Properties {
         }\r
         \r
         /// <summary>\r
-        ///   Looks up a localized string similar to Use QSV Decoding for non QSV encoders..\r
+        ///   Looks up a localized string similar to Also Use QSV Decoding when not using a QuickSync encoder. (i.e. x265) .\r
         /// </summary>\r
         public static string Options_QsvDecodeForNonFullPath {\r
             get {\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index faecd423a130af825203de24d3ca71b5cef5165d..32814de312b5fdc0a52ccac6bd75b259aa572d96 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -772,7 +772,7 @@
     <value>Priority Level:</value>\r
   </data>\r
   <data name="Options_QsvDecode" xml:space="preserve">\r
-    <value>Disable QuickSync Decoding</value>\r
+    <value>Enable QuickSync Decoding</value>\r
   </data>\r
   <data name="Options_RemovePunctuation" xml:space="preserve">\r
     <value>Remove common punctuation</value>\r
@@ -882,7 +882,7 @@ This will not affect your current settings in the Subtitle tab.</value>
     <value>Manage Preset</value>\r
   </data>\r
   <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">\r
-    <value>Use QSV Decoding for non QSV encoders.</value>\r
+    <value>Also Use QSV Decoding when not using a QuickSync encoder. (i.e. x265) </value>\r
   </data>\r
   <data name="Options_LowDiskspaceSize" xml:space="preserve">\r
     <value>Low diskspace warning level (GB):</value>\r

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index 18021c9bc91ceaea05ed3b8afdba577db136f077..115973eace8fec47608471fadaa060a891f9596a 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
@@ -303,7 +303,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
                 video.Turbo = job.TurboFirstPass;
             }
 
-            video.QSV.Decode = SystemInfo.IsQsvAvailable && !configuration.DisableQuickSyncDecoding;
+            video.QSV.Decode = SystemInfo.IsQsvAvailable && configuration.EnableQuickSyncDecoding;
 
             // The use of the QSV decoder is configurable for non QSV encoders.
             if (video.QSV.Decode && job.VideoEncoder != VideoEncoder.QuickSync && job.VideoEncoder != VideoEncoder.QuickSyncH265)

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 62ace3257f26fd0d9daa63ec53133a877325eed7..b10b9c19e3b7afed46c704c10643d2f453614794 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -676,7 +676,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.VideoPreset = export.Task.VideoPreset != null ? export.Task.VideoPreset.ShortName : null;\r
             preset.VideoProfile = export.Task.VideoProfile != null ? export.Task.VideoProfile.ShortName : null;\r
             preset.VideoQSVAsyncDepth = 4; // Defaulted to 4 for now.\r
-            preset.VideoQSVDecode = !config.DisableQuickSyncDecoding;\r
+            preset.VideoQSVDecode = config.EnableQuickSyncDecoding;\r
             preset.VideoQualitySlider = export.Task.Quality.HasValue ? export.Task.Quality.Value : 0;\r
             preset.VideoQualityType = (int)export.Task.VideoEncodeRateType;\r
             preset.VideoScaler = EnumHelper<VideoScaler>.GetShortName(config.ScalingMode);\r

diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index b6ec562bb3002b25fc1a52668c52680ce8fbc964..83fa3ee072cc451bb6c231c2a7d23b6c1115545d 100644 (file)
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -164,7 +164,7 @@ namespace HandBrakeWPF
         /// <summary>\r
         /// The disable quick sync decoding.\r
         /// </summary>\r
-        public const string DisableQuickSyncDecoding = "DisableQuickSyncDecoding";\r
+        public const string EnableQuickSyncDecoding = "EnableQuickSyncDecoding";\r
 \r
         /// <summary>\r
         /// Setting indicating whether to use qsv decode for non qsv encoders\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 4b7a4ac3e3fd8369fb66ed2b8fb4bb87cedeae2c..b0a47cde0910bd37cff6f81ebc72b1a76979bfba 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -89,7 +89,7 @@ namespace HandBrakeWPF.ViewModels
         private bool removePunctuation;\r
         private bool resetWhenDoneAction;\r
 \r
-        private bool disableQuickSyncDecoding;\r
+        private bool enableQuickSyncDecoding;\r
         private bool showQueueInline;\r
         private bool pauseOnLowDiskspace;\r
         private long pauseOnLowDiskspaceLevel;\r
@@ -971,20 +971,20 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>\r
         /// Gets or sets a value indicating whether disable quick sync decoding.\r
         /// </summary>\r
-        public bool DisableQuickSyncDecoding\r
+        public bool EnableQuickSyncDecoding\r
         {\r
             get\r
             {\r
-                return this.disableQuickSyncDecoding;\r
+                return this.enableQuickSyncDecoding;\r
             }\r
             set\r
             {\r
-                if (value.Equals(this.disableQuickSyncDecoding))\r
+                if (value.Equals(this.enableQuickSyncDecoding))\r
                 {\r
                     return;\r
                 }\r
-                this.disableQuickSyncDecoding = value;\r
-                this.NotifyOfPropertyChange(() => this.DisableQuickSyncDecoding);\r
+                this.enableQuickSyncDecoding = value;\r
+                this.NotifyOfPropertyChange(() => this.EnableQuickSyncDecoding);\r
                 this.NotifyOfPropertyChange(() => this.IsUseQsvDecAvailable);\r
             }\r
         }\r
@@ -1012,7 +1012,7 @@ namespace HandBrakeWPF.ViewModels
         {\r
             get\r
             {\r
-                return IsQuickSyncAvailable && !this.DisableQuickSyncDecoding;\r
+                return IsQuickSyncAvailable && this.EnableQuickSyncDecoding;\r
             }\r
         }\r
 \r
@@ -1325,7 +1325,7 @@ namespace HandBrakeWPF.ViewModels
             // #############################\r
             // Video\r
             // #############################\r
-            this.DisableQuickSyncDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding);\r
+            this.EnableQuickSyncDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncDecoding);\r
             this.SelectedScalingMode = this.userSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode);\r
             this.UseQSVDecodeForNonQSVEnc = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseQSVDecodeForNonQSVEnc);\r
 \r
@@ -1460,7 +1460,7 @@ namespace HandBrakeWPF.ViewModels
             this.userSettingService.SetUserSetting(UserSettingConstants.VLCPath, this.VLCPath);\r
 \r
             /* Video */\r
-            this.userSettingService.SetUserSetting(UserSettingConstants.DisableQuickSyncDecoding, this.DisableQuickSyncDecoding);\r
+            this.userSettingService.SetUserSetting(UserSettingConstants.EnableQuickSyncDecoding, this.EnableQuickSyncDecoding);\r
             this.userSettingService.SetUserSetting(UserSettingConstants.ScalingMode, this.SelectedScalingMode);\r
             this.userSettingService.SetUserSetting(UserSettingConstants.UseQSVDecodeForNonQSVEnc, this.UseQSVDecodeForNonQSVEnc);\r
 \r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index e0166e8fa5ec9d9b29ddc203254a9342c2efa2cf..0743e0b9d5f58175742c78f87299841c6d7cd8a1 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -238,9 +238,9 @@
 \r
                         <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Decoding}" FontSize="14" Margin="0,10,0,10" />\r
 \r
-                        <StackPanel Orientation="Vertical" Margin="20,10,0,0">\r
-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_QsvDecode}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding DisableQuickSyncDecoding}" />\r
-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_QsvDecodeForNonFullPath}" IsEnabled="{Binding IsUseQsvDecAvailable}" IsChecked="{Binding UseQSVDecodeForNonQSVEnc}" />\r
+                        <StackPanel Orientation="Vertical" Margin="20,0,0,0">\r
+                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_QsvDecode}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding EnableQuickSyncDecoding}" />\r
+                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_QsvDecodeForNonFullPath}" Visibility="{Binding IsUseQsvDecAvailable, Converter={StaticResource boolToVisConverter}}" IsChecked="{Binding UseQSVDecodeForNonQSVEnc}" />\r
                             <TextBlock Text="{x:Static Properties:Resources.Video_QuickSyncNotAvailable}" Margin="17,2,0,0" TextWrapping="Wrap"\r
                                         Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
                         </StackPanel>\r

diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml
index 1cf6f9de022e5dcc79df788166d812166ccf336e..6b8507f36027c63d4d03b64b56502ab614e3953a 100644 (file)
--- a/win/CS/HandBrakeWPF/defaultsettings.xml
+++ b/win/CS/HandBrakeWPF/defaultsettings.xml
@@ -418,7 +418,7 @@
   </item>\r
   <item>\r
     <key>\r
-      <string>DisableQuickSyncDecoding</string>\r
+      <string>EnableQuickSyncDecoding</string>\r
     </key>\r
     <value>\r
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>\r