WinGui: All the hardware acceleration options are now available view a new tab on the Options screen. This includes the OpenCL scaling, QuickSync and DXVA decode support.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5818 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 21 insertions, 46 deletions

diff --git a/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs
index 1eeedd653..d7f7779d5 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs
@@ -13,6 +13,7 @@ namespace HandBrakeWPF.Converters.Video
     using System.Globalization;

     using System.Windows.Data;

 

+    using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Utilities;

 

     using HandBrakeWPF.Model;

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 02b1f0bc7..bb24758b6 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -136,7 +136,6 @@
     <Compile Include="Constants.cs" />

     <Compile Include="Controls\SplitButton\SplitMenuButton.cs" />

     <Compile Include="Converters\Video\ScalingConverter.cs" />

-    <Compile Include="Model\VideoScaler.cs" />

     <Compile Include="ViewModels\CountdownAlertViewModel.cs" />

     <Compile Include="ViewModels\Interfaces\ICountdownAlertViewModel.cs" />

     <Compile Include="Views\CountdownAlertView.xaml.cs">

diff --git a/win/CS/HandBrakeWPF/Model/VideoScaler.cs b/win/CS/HandBrakeWPF/Model/VideoScaler.cs
deleted file mode 100644
index 53ff3eb1b..000000000
--- a/win/CS/HandBrakeWPF/Model/VideoScaler.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="VideoScaler.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   The different scaling modes available in HandBrake

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrakeWPF.Model

-{

-    using System.ComponentModel.DataAnnotations;

-

-    /// <summary>

-    ///  The different scaling modes available in HandBrake

-    /// </summary>

-    public enum VideoScaler

-    {

-        [Display(Name = "Lanczos")]

-        Lanczos = 0,

-

-        [Display(Name = "Bicubic")]

-        Bicubic,

-

-        [Display(Name = "Bicubic (OpenCL)")]

-        BicubicCl,

-    }

-}

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index b432cc0bd..3e55ad7e5 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -385,7 +385,7 @@ namespace HandBrakeWPF.Properties {
         

         /// <summary>

         ///   Looks up a localized string similar to Please note, this option is suitable only for slower systems.

-        ///Hardware decoders are designed for playback, not for re-encoding video so will likely bottleneck on faster systems..

+        ///Hardware decoders are currently designed for playback, not for re-encoding video so will likely bottleneck on faster systems..

         /// </summary>

         public static string Video_DxvaDecode {

             get {

@@ -466,9 +466,9 @@ namespace HandBrakeWPF.Properties {
         ///

         ///In order to use the QuickSync encoder, you must:

         ///

-        ///- Have a Intel Core series CPU with HD Graphics.

+        ///- Have a Intel Core series CPU with HD Graphics. Haswell or newer parts are recommended.

         ///- Have a monitor connected to the HD Graphics

-        ///- Note in multi-GPU environments, there may be workarounds but these are not officially supported..

+        ///- Note that in multi-GPU enviroments, you may need to use 3rd party tools and workarounds to active the hardware..

         /// </summary>

         public static string Video_QuickSyncNotAvailable {

             get {

@@ -478,9 +478,9 @@ namespace HandBrakeWPF.Properties {
         

         /// <summary>

         ///   Looks up a localized string similar to Lanczos  - This is HandBrakes default scaler. It provides the best quality downscaling.

-        ///Bicubic   - Bicubic is faster but quality may not be as good. Video may not appear as soft and as a result file sizes may be larger

         ///Bicubic OpenCL - A hardware accelerated version of the CPU based Bicubic scaler. 

-        ///                                This can be around 5~7% faster than software bicubic on a fast modern graphics card..

+        ///                                This can be around 5~7% faster than software bicubic on a fast modern graphics card.

+        ///                                If OpenCL is unavailable, it will fallback to a software scaler. .

         /// </summary>

         public static string Video_ScalingModes {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 3a7231687..95de8bf8f 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -352,21 +352,21 @@ If you do not use this tab, it can be hidden from: Tools Menu &gt; Options &gt;
   </data>

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

     <value>Please note, this option is suitable only for slower systems.

-Hardware decoders are designed for playback, not for re-encoding video so will likely bottleneck on faster systems.</value>

+Hardware decoders are currently designed for playback, not for re-encoding video so will likely bottleneck on faster systems.</value>

   </data>

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

     <value>QuickSync hardware not detected! 

 

 In order to use the QuickSync encoder, you must:

 

-- Have a Intel Core series CPU with HD Graphics.

+- Have a Intel Core series CPU with HD Graphics. Haswell or newer parts are recommended.

 - Have a monitor connected to the HD Graphics

-- Note in multi-GPU environments, there may be workarounds but these are not officially supported.</value>

+- Note that in multi-GPU enviroments, you may need to use 3rd party tools and workarounds to active the hardware.</value>

   </data>

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

     <value>Lanczos  - This is HandBrakes default scaler. It provides the best quality downscaling.

-Bicubic   - Bicubic is faster but quality may not be as good. Video may not appear as soft and as a result file sizes may be larger

 Bicubic OpenCL - A hardware accelerated version of the CPU based Bicubic scaler. 

-                                This can be around 5~7% faster than software bicubic on a fast modern graphics card.</value>

+                                This can be around 5~7% faster than software bicubic on a fast modern graphics card.

+                                If OpenCL is unavailable, it will fallback to a software scaler. </value>

   </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 1ce0f000e..0a4837719 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1342,7 +1342,9 @@ namespace HandBrakeWPF.ViewModels
                 userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),

                 userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),

                 userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav),

-                    userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableQuickSyncDecoding)),

+                    userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableQuickSyncDecoding),

+                                       userSettingService.GetUserSetting<bool>(ASUserSettingConstants.EnableDxva),

+                                       userSettingService.GetUserSetting<VideoScaler>(ASUserSettingConstants.ScalingMode) == VideoScaler.BicubicCl),

                 "CLI Query",

                 MessageBoxButton.OK,

                 MessageBoxImage.Information);

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index e6d47241f..cd2d10423 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -22,6 +22,7 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices;

+    using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Utilities;

 

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index df7edf4e8..c31fccae6 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -313,28 +313,28 @@
 

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

 

-                        <TextBlock Text="Decoding" FontSize="14" Margin="0,10,0,10" Visibility="Collapsed" />

+                        <TextBlock Text="Decoding" FontSize="14" Margin="0,10,0,10" />

 

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

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

                             <CheckBox Content="Enable DXVA Hardware Accelerated Decoding" IsChecked="{Binding EnableDxvaDecoding}" />

 

                         </StackPanel>

 

-                        <StackPanel Orientation="Vertical" Margin="37,2,0,0" Visibility="Collapsed" >

+                        <StackPanel Orientation="Vertical" Margin="37,2,0,0"  >

                             <TextBlock Text="{x:Static Properties:Resources.Video_DxvaDecode}"  />

                         </StackPanel>

 

 

-                        <TextBlock Text="Scaling" FontSize="14" Margin="0,20,0,10" Visibility="Collapsed" />

+                        <TextBlock Text="Scaling" FontSize="14" Margin="0,20,0,10" />

                         

-                        <StackPanel Orientation="Horizontal" Margin="20,0,0,0" Visibility="Collapsed">

+                        <StackPanel Orientation="Horizontal" Margin="20,0,0,0">

                             <TextBlock Text="Choose Scaler: " Margin="0,0,5,0" VerticalAlignment="Center" />

                             <ComboBox  ItemsSource="{Binding ScalingOptions, Converter={StaticResource enumComboConverter}}" 

                                        SelectedItem="{Binding SelectedScalingMode, Converter={StaticResource enumComboConverter}}" 

                                        Width="120" VerticalAlignment="Center" />

                         </StackPanel>

 

-                        <StackPanel Orientation="Vertical" Margin="26,2,0,0" Visibility="Collapsed" >

+                        <StackPanel Orientation="Vertical" Margin="26,2,0,0" >

                             <TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap "/>

                         </StackPanel>