WinGUI: Remove option to enable DXVA decoding. There are too many issues with timestamp handling and no easy way to fix them so instead of having a higher failure rate, we've decided to remove this.

12 files changed, 1 insertions, 83 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs b/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs
index 7cce56bb5..a27eae1be 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/HBConfiguration.cs
@@ -25,11 +25,6 @@ namespace HandBrake.ApplicationServices.Model
         public bool DisableQuickSyncDecoding { get; set; }

 

         /// <summary>

-        /// Gets or sets a value indicating whether enable dxva.

-        /// </summary>

-        public bool EnableDxva { get; set; }

-

-        /// <summary>

         /// Gets or sets the scaling mode.

         /// </summary>

         public VideoScaler ScalingMode { get; set; }

diff --git a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
index c500ef7b1..6c702e8b0 100644
--- a/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
+++ b/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs
@@ -37,7 +37,6 @@ namespace HandBrakeWPF.Factories
                                          {

                                              IsDvdNavDisabled = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav), 

                                              DisableQuickSyncDecoding = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding), 

-                                             EnableDxva = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDxva), 

                                              ScalingMode = UserSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode), 

                                              PreviewScanCount = UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount), 

                                              Verbosity = UserSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity), 

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 69399b597..2f8cd2bef 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -61,7 +61,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Copyright (C) 2003-2015 The HandBrake Team

+        ///   Looks up a localized string similar to Copyright (C) 2003-2016 The HandBrake Team

         ///

         ///This program is free software; you can redistribute it and/or

         ///modify it under the terms of the GNU General Public License

@@ -1728,15 +1728,6 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Accelerates H.264, MPEG-4, VC1 and WMV3  and can provide a small speed improvement on lower end hardware..

-        /// </summary>

-        public static string Video_DxvaDecode {

-            get {

-                return ResourceManager.GetString("Video_DxvaDecode", resourceCulture);

-            }

-        }

-        

-        /// <summary>

         ///   Looks up a localized string similar to The full list of encoder parameters: 

         ///{0}.

         /// </summary>

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 656a10b9f..dcb268430 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -312,9 +312,6 @@ If you do not use this tab, it can be hidden from: Tools Menu &gt; Options &gt;
   <data name="Video_PlaceboQuality" xml:space="preserve">

     <value>Placebo Quality |</value>

   </data>

-  <data name="Video_DxvaDecode" xml:space="preserve">

-    <value>Accelerates H.264, MPEG-4, VC1 and WMV3  and can provide a small speed improvement on lower end hardware.</value>

-  </data>

   <data name="Video_QuickSyncNotAvailable" xml:space="preserve">

     <value>QuickSync hardware not detected or enabled! 

 

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index 62faa5ec9..698cf086d 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1096,15 +1096,6 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Enable DXVA Hardware Accelerated Decoding.

-        /// </summary>

-        public static string Options_DXVA {

-            get {

-                return ResourceManager.GetString("Options_DXVA", resourceCulture);

-            }

-        }

-        

-        /// <summary>

         ///   Looks up a localized string similar to Format:.

         /// </summary>

         public static string Options_Format {

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index 9856e420a..c77f2580c 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -735,9 +735,6 @@
   <data name="Options_DvdRead" xml:space="preserve">

     <value>Disable LibDVDNav. (libdvdread will be used instead)</value>

   </data>

-  <data name="Options_DXVA" xml:space="preserve">

-    <value>Enable DXVA Hardware Accelerated Decoding</value>

-  </data>

   <data name="Options_Format" xml:space="preserve">

     <value>Format:</value>

   </data>

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index 5167e7218..cd4fbb44f 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
@@ -17,12 +17,10 @@ namespace HandBrakeWPF.Services.Encode.Factories
 
     using HandBrake.ApplicationServices.Interop;
     using HandBrake.ApplicationServices.Interop.HbLib;
-    using HandBrake.ApplicationServices.Interop.Helpers;
     using HandBrake.ApplicationServices.Interop.Json.Encode;
     using HandBrake.ApplicationServices.Interop.Json.Shared;
     using HandBrake.ApplicationServices.Interop.Model.Encoding;
     using HandBrake.ApplicationServices.Model;
-    using HandBrake.ApplicationServices.Utilities;
 
     using HandBrakeWPF.Utilities;
 
@@ -46,12 +44,6 @@ namespace HandBrakeWPF.Services.Encode.Factories
     /// </summary>
     internal class EncodeFactory
     {
-        /*
-         * TODO:
-         * 1. OpenCL and HWD Support 
-         * 2. Rotate Support
-         */
-
         /// <summary>
         /// The create.
         /// </summary>
@@ -309,7 +301,6 @@ namespace HandBrakeWPF.Services.Encode.Factories
             }
 
             video.OpenCL = configuration.ScalingMode == VideoScaler.BicubicCl;
-            video.HWDecode = configuration.EnableDxva;
             video.QSV.Decode = !configuration.DisableQuickSyncDecoding;
 
             return video;
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 8b323d396..7bcbc6a08 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -615,7 +615,6 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.VideoFramerate = export.Task.Framerate.ToString();

             preset.VideoFramerateMode = EnumHelper<FramerateMode>.GetShortName(export.Task.FramerateMode);

             preset.VideoGrayScale = export.Task.Grayscale;

-            preset.VideoHWDecode = false;

             preset.VideoLevel = export.Task.VideoLevel.ShortName;

             preset.VideoOptionExtra = export.Task.ExtraAdvancedArguments;

             preset.VideoPreset = export.Task.VideoPreset.ShortName;

diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index f623c15d4..fabd5ee9d 100644
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -167,11 +167,6 @@ namespace HandBrakeWPF
         public const string DisableQuickSyncDecoding = "DisableQuickSyncDecoding";

 

         /// <summary>

-        /// The enable dxva.

-        /// </summary>

-        public const string EnableDxva = "EnableDxva";

-

-        /// <summary>

         /// The scaling mode.

         /// </summary>

         public const string ScalingMode = "ScalingMode";

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 69df5a635..c28eea1f8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -84,7 +84,6 @@ namespace HandBrakeWPF.ViewModels
         private bool removePunctuation;

         private bool resetWhenDoneAction;

         private VideoScaler selectedScalingMode;

-        private bool enableDxvaDecoding;

         private bool disableQuickSyncDecoding;

         private bool isClScaling;

         private bool showQueueInline;

@@ -874,26 +873,6 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

-        /// Gets or sets a value indicating whether enable dxva decoding.

-        /// </summary>

-        public bool EnableDxvaDecoding

-        {

-            get

-            {

-                return this.enableDxvaDecoding;

-            }

-            set

-            {

-                if (value.Equals(this.enableDxvaDecoding))

-                {

-                    return;

-                }

-                this.enableDxvaDecoding = value;

-                this.NotifyOfPropertyChange(() => this.EnableDxvaDecoding);

-            }

-        }

-

-        /// <summary>

         /// Gets or sets the selected scaling mode.

         /// </summary>

         public VideoScaler SelectedScalingMode

@@ -1223,7 +1202,6 @@ namespace HandBrakeWPF.ViewModels
             // Video

             // #############################

             this.DisableQuickSyncDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding);

-            this.EnableDxvaDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDxva);

             this.SelectedScalingMode = this.userSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode);

 

             // #############################

@@ -1325,7 +1303,6 @@ namespace HandBrakeWPF.ViewModels
 

             /* Video */

             this.userSettingService.SetUserSetting(UserSettingConstants.DisableQuickSyncDecoding, this.DisableQuickSyncDecoding);

-            this.userSettingService.SetUserSetting(UserSettingConstants.EnableDxva, this.EnableDxvaDecoding);

             this.userSettingService.SetUserSetting(UserSettingConstants.ScalingMode, this.SelectedScalingMode);

 

             /* System and Logging */

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 777264526..4442b9c95 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -212,12 +212,6 @@
 

                         <TextBlock Text="{x:Static Properties:ResourcesUI.Options_Decoding}" FontSize="14" Margin="0,10,0,10" />

 

-                        <StackPanel Orientation="Vertical" Margin="20,0,0,0"  >

-                            <CheckBox Content="{x:Static Properties:ResourcesUI.Options_DXVA}" IsChecked="{Binding EnableDxvaDecoding}" />

-                            <TextBlock Text="{x:Static Properties:Resources.Video_DxvaDecode}" Margin="17,2,0,0" />

-

-                        </StackPanel>

-

                         <StackPanel Orientation="Vertical" Margin="20,10,0,0">

                             <CheckBox Content="{x:Static Properties:ResourcesUI.Options_QsvDecode}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding DisableQuickSyncDecoding}" />

                             <TextBlock Text="{x:Static Properties:Resources.Video_QuickSyncNotAvailable}" Margin="17,2,0,0" TextWrapping="Wrap"

diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml
index fc7856d72..05e0090b6 100644
--- a/win/CS/HandBrakeWPF/defaultsettings.xml
+++ b/win/CS/HandBrakeWPF/defaultsettings.xml
@@ -426,14 +426,6 @@
   </item>

   <item>

     <key>

-      <string>EnableDxva</string>

-    </key>

-    <value>

-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>

-    </value>

-  </item>

-  <item>

-    <key>

       <string>ScalingMode</string>

     </key>

     <value>