From: sr55 Date: Wed, 13 Dec 2017 21:41:11 +0000 (+0000) Subject: WinGui: Make the QSV Decoding options clearer. X-Git-Tag: 1.1.0~211 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfc0989df7f651de0eb64069fc9a9d2ca43171dd;p=handbrake 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 f8b2eb69f..fd8c97ea3 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs @@ -22,7 +22,7 @@ namespace HandBrake.ApplicationServices.Model /// /// Gets or sets a value indicating whether disable quick sync decoding. /// - public bool DisableQuickSyncDecoding { get; set; } + public bool EnableQuickSyncDecoding { get; set; } /// /// Gets or sets a value indicating whether use qsv decode for non qsv enc. diff --git a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs index dc3fa1983..d6ac2f7f5 100644 --- a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs +++ b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs @@ -35,8 +35,8 @@ namespace HandBrakeWPF.Factories { HBConfiguration config = new HBConfiguration { - IsDvdNavDisabled = UserSettingService.GetUserSetting(UserSettingConstants.DisableLibDvdNav), - DisableQuickSyncDecoding = UserSettingService.GetUserSetting(UserSettingConstants.DisableQuickSyncDecoding), + IsDvdNavDisabled = UserSettingService.GetUserSetting(UserSettingConstants.DisableLibDvdNav), + EnableQuickSyncDecoding = UserSettingService.GetUserSetting(UserSettingConstants.EnableQuickSyncDecoding), UseQSVDecodeForNonQSVEnc = UserSettingService.GetUserSetting(UserSettingConstants.UseQSVDecodeForNonQSVEnc), ScalingMode = UserSettingService.GetUserSetting(UserSettingConstants.ScalingMode), PreviewScanCount = UserSettingService.GetUserSetting(UserSettingConstants.PreviewScanCount), diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs index 5bafddb3e..d40aa4e0a 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs @@ -1465,7 +1465,7 @@ namespace HandBrakeWPF.Properties { } /// - /// Looks up a localized string similar to Disable QuickSync Decoding. + /// Looks up a localized string similar to Enable QuickSync Decoding. /// public static string Options_QsvDecode { get { @@ -1474,7 +1474,7 @@ namespace HandBrakeWPF.Properties { } /// - /// Looks up a localized string similar to Use QSV Decoding for non QSV encoders.. + /// Looks up a localized string similar to Also Use QSV Decoding when not using a QuickSync encoder. (i.e. x265) . /// public static string Options_QsvDecodeForNonFullPath { get { diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx index faecd423a..32814de31 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx +++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx @@ -772,7 +772,7 @@ Priority Level: - Disable QuickSync Decoding + Enable QuickSync Decoding Remove common punctuation @@ -882,7 +882,7 @@ This will not affect your current settings in the Subtitle tab. Manage Preset - Use QSV Decoding for non QSV encoders. + Also Use QSV Decoding when not using a QuickSync encoder. (i.e. x265) Low diskspace warning level (GB): diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs index 18021c9bc..115973eac 100644 --- 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 62ace3257..b10b9c19e 100644 --- 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; preset.VideoProfile = export.Task.VideoProfile != null ? export.Task.VideoProfile.ShortName : null; preset.VideoQSVAsyncDepth = 4; // Defaulted to 4 for now. - preset.VideoQSVDecode = !config.DisableQuickSyncDecoding; + preset.VideoQSVDecode = config.EnableQuickSyncDecoding; preset.VideoQualitySlider = export.Task.Quality.HasValue ? export.Task.Quality.Value : 0; preset.VideoQualityType = (int)export.Task.VideoEncodeRateType; preset.VideoScaler = EnumHelper.GetShortName(config.ScalingMode); diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs index b6ec562bb..83fa3ee07 100644 --- a/win/CS/HandBrakeWPF/UserSettingConstants.cs +++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs @@ -164,7 +164,7 @@ namespace HandBrakeWPF /// /// The disable quick sync decoding. /// - public const string DisableQuickSyncDecoding = "DisableQuickSyncDecoding"; + public const string EnableQuickSyncDecoding = "EnableQuickSyncDecoding"; /// /// Setting indicating whether to use qsv decode for non qsv encoders diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index 4b7a4ac3e..b0a47cde0 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -89,7 +89,7 @@ namespace HandBrakeWPF.ViewModels private bool removePunctuation; private bool resetWhenDoneAction; - private bool disableQuickSyncDecoding; + private bool enableQuickSyncDecoding; private bool showQueueInline; private bool pauseOnLowDiskspace; private long pauseOnLowDiskspaceLevel; @@ -971,20 +971,20 @@ namespace HandBrakeWPF.ViewModels /// /// Gets or sets a value indicating whether disable quick sync decoding. /// - public bool DisableQuickSyncDecoding + public bool EnableQuickSyncDecoding { get { - return this.disableQuickSyncDecoding; + return this.enableQuickSyncDecoding; } set { - if (value.Equals(this.disableQuickSyncDecoding)) + if (value.Equals(this.enableQuickSyncDecoding)) { return; } - this.disableQuickSyncDecoding = value; - this.NotifyOfPropertyChange(() => this.DisableQuickSyncDecoding); + this.enableQuickSyncDecoding = value; + this.NotifyOfPropertyChange(() => this.EnableQuickSyncDecoding); this.NotifyOfPropertyChange(() => this.IsUseQsvDecAvailable); } } @@ -1012,7 +1012,7 @@ namespace HandBrakeWPF.ViewModels { get { - return IsQuickSyncAvailable && !this.DisableQuickSyncDecoding; + return IsQuickSyncAvailable && this.EnableQuickSyncDecoding; } } @@ -1325,7 +1325,7 @@ namespace HandBrakeWPF.ViewModels // ############################# // Video // ############################# - this.DisableQuickSyncDecoding = this.userSettingService.GetUserSetting(UserSettingConstants.DisableQuickSyncDecoding); + this.EnableQuickSyncDecoding = this.userSettingService.GetUserSetting(UserSettingConstants.EnableQuickSyncDecoding); this.SelectedScalingMode = this.userSettingService.GetUserSetting(UserSettingConstants.ScalingMode); this.UseQSVDecodeForNonQSVEnc = this.userSettingService.GetUserSetting(UserSettingConstants.UseQSVDecodeForNonQSVEnc); @@ -1460,7 +1460,7 @@ namespace HandBrakeWPF.ViewModels this.userSettingService.SetUserSetting(UserSettingConstants.VLCPath, this.VLCPath); /* Video */ - this.userSettingService.SetUserSetting(UserSettingConstants.DisableQuickSyncDecoding, this.DisableQuickSyncDecoding); + this.userSettingService.SetUserSetting(UserSettingConstants.EnableQuickSyncDecoding, this.EnableQuickSyncDecoding); this.userSettingService.SetUserSetting(UserSettingConstants.ScalingMode, this.SelectedScalingMode); this.userSettingService.SetUserSetting(UserSettingConstants.UseQSVDecodeForNonQSVEnc, this.UseQSVDecodeForNonQSVEnc); diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index e0166e8fa..0743e0b9d 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -238,9 +238,9 @@ - - - + + + diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml index 1cf6f9de0..6b8507f36 100644 --- a/win/CS/HandBrakeWPF/defaultsettings.xml +++ b/win/CS/HandBrakeWPF/defaultsettings.xml @@ -418,7 +418,7 @@ - DisableQuickSyncDecoding + EnableQuickSyncDecoding false