WinGui: Add Clear warnings that OpenCL and DXVA code is considered experimental.

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

3 files changed, 15 insertions, 15 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 33dd772c7..3cc320e5e 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -842,8 +842,8 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Accelerates H.264, MPEG-4, VC1 and WMV3 only.  

-        ///This can provide a small to modest improvement on slow hardware..

+        ///   Looks up a localized string similar to WARNING: This feature is experimental and has known issues. Suitable for testing only!

+        ///Accelerates H.264, MPEG-4, VC1 and WMV3 only and can provide a small improvement on low end hardware..

         /// </summary>

         public static string Video_DxvaDecode {

             get {

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

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

         ///

-        ///- Have a Intel Core series CPU with HD Graphics. 4th Generation Haswell or newer parts are recommended for best quality.

-        ///- Have a monitor connected to the HD Graphics or GPU Virtualisation software installed.

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

+        ///- Have a Intel CPU with HD Graphics and QuickSync support. 4th Generation Haswell or newer parts are recommended for best quality.

+        ///- Have the HD Graphics enabled. 

+        ///- On older versions of windows before 8.x, a monitor connected to the HD Graphics or GPU Virtualisation software installed is also required..

         /// </summary>

         public static string Video_QuickSyncNotAvailable {

             get {

@@ -987,7 +987,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to OpenCL Scaling is only available for modern graphics cards that support OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use.  Performance gain up to 5%. Minor decrease in quality in some cases..

+        ///   Looks up a localized string similar to WARNING: OpenCL scaling is still in beta.  It is only available for modern graphics cards that support OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use.  Performance gain up to 5%. Minor decrease in quality in some cases..

         /// </summary>

         public static string Video_ScalingModes {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 05317d800..ae889dd63 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -347,20 +347,20 @@ If you do not use this tab, it can be hidden from: Tools Menu &gt; Options &gt;
     <value>Placebo Quality |</value>

   </data>

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

-    <value>Accelerates H.264, MPEG-4, VC1 and WMV3 only.  

-This can provide a small to modest improvement on slow hardware.</value>

+    <value>WARNING: This feature is experimental and has known issues. Suitable for testing only!

+Accelerates H.264, MPEG-4, VC1 and WMV3 only and can provide a small improvement on low end hardware.</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. 4th Generation Haswell or newer parts are recommended for best quality.

-- Have a monitor connected to the HD Graphics or GPU Virtualisation software installed.

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

+- Have a Intel CPU with HD Graphics and QuickSync support. 4th Generation Haswell or newer parts are recommended for best quality.

+- Have the HD Graphics enabled. 

+- On older versions of windows before 8.x, a monitor connected to the HD Graphics or GPU Virtualisation software installed is also required.</value>

   </data>

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

-    <value>OpenCL Scaling is only available for modern graphics cards that support OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use.  Performance gain up to 5%. Minor decrease in quality in some cases.</value>

+    <value>WARNING: OpenCL scaling is still in beta.  It is only available for modern graphics cards that support OpenCL 1.1 or later. It will fallback to Lanczos software scaling when it is not available for use.  Performance gain up to 5%. Minor decrease in quality in some cases.</value>

   </data>

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

     <value>Error</value>

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 45a042136..f891da8ee 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -220,14 +220,14 @@
                         <TextBlock Text="Decoding" FontSize="14" Margin="0,10,0,10" />

 

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

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

+                            <CheckBox Content="Enable DXVA Hardware Accelerated Decoding (Experimental)" 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="Disable QuickSync Decoding" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding DisableQuickSyncDecoding}" />

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

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

                                         Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

                         </StackPanel>

 

@@ -241,7 +241,7 @@
                         </StackPanel>

 

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

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

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

                                        Visibility="{Binding IsClScaling, Converter={StaticResource boolToVisConverter}}" />

                         </StackPanel>