WinGui: Utilise new hb_global_init_no_hardware when hb_global_init fails. The preferences Video tab now notes that hardware encoding options are disabled.

5 files changed, 47 insertions, 53 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index bebf83f6f..b9c05191f 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -3024,6 +3024,17 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Hardware encoding support has been automatically disabled on your system due to an issue detected during hardware detection. Please make sure you are running up-to-date drivers for all graphics adaptors in this system.
+        ///
+        ///This will not impact any of the software encoders..
+        /// </summary>
+        public static string OptionsView_HardwareDetectFailed {
+            get {
+                return ResourceManager.GetString("OptionsView_HardwareDetectFailed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to The file format entered contained invalid characters. These have been removed. .
         /// </summary>
         public static string OptionsView_InvalidFileFormatChars {
@@ -5027,21 +5038,6 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to QuickSync hardware not detected or enabled! 
-        ///
-        ///In order to use the QuickSync encoder, you must:
-        ///
-        ///- 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, a monitor connected to the HD Graphics or GPU Virtualisation software installed is also required..
-        /// </summary>
-        public static string Video_QuickSyncNotAvailable {
-            get {
-                return ResourceManager.GetString("Video_QuickSyncNotAvailable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Reduce decoder CPU usage.
         ///
         ///Set this if your device is struggling to play the output. (i.e. dropped frames).
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.de.resx b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
index 905e7b701..5b4581b73 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.de.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -170,15 +170,6 @@ Quellenmaximum: Kodiert nach Möglichkeit immer mit der Quellauflösung.</value>
   <data name="Video_PlaceboQuality" xml:space="preserve">
     <value>Placebo Qualität |</value>
   </data>
-  <data name="Video_QuickSyncNotAvailable" xml:space="preserve">
-    <value>QuickSync-Hardware nicht erkannt oder aktiviert! 
-
-Um den QuickSync-Kodierer verwenden zu können, muss: 
-
-- Eine Intel CPU mit HD-Grafik und QuickSync-Unterstützung vorhanden sein. Haswell der vierten Generation oder neuer werden für beste Qualität empfohlen.
-- HD-Grafik muss aktiviert sein.
-- Bei älteren Versionen vor Windows 8 ist außerdem ein Monitor erforderlich, der an die installierte HD-Grafik- oder GPU-Virtualisierungssoftware angeschlossen ist.</value>
-  </data>
   <data name="Error" xml:space="preserve">
     <value>Fehler</value>
   </data>
@@ -1883,4 +1874,4 @@ Dies beeinflusst nicht die momentanen Einstellungen im Untertitel-Tab. </value>
   <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
     <value>Zeige 'Auswahl zur Warteschlange hinzufügen' in der Symbolleiste</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 89ec0714c..1cf4cfc4e 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -184,15 +184,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.<
   <data name="Video_PlaceboQuality" xml:space="preserve">

     <value>Placebo Quality |</value>

   </data>

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

-    <value>QuickSync hardware not detected or enabled! 

-

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

-

-- 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, a monitor connected to the HD Graphics or GPU Virtualisation software installed is also required.</value>

-  </data>

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

     <value>Error</value>

   </data>

@@ -1897,4 +1888,9 @@ This will not affect your current settings in the Subtitle tab.</value>
   <data name="Options_ShowToolbarAddSelection" xml:space="preserve">

     <value>Show 'Add Selection to Queue' on the toolbar</value>

   </data>

+  <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">

+    <value>Hardware encoding support has been automatically disabled on your system due to an issue detected during hardware detection. Please make sure you are running up-to-date drivers for all graphics adaptors in this system.

+

+This will not impact any of the software encoders.</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index cf63d1daf..f4daf2e23 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -19,6 +19,7 @@ namespace HandBrakeWPF.ViewModels
 

     using Caliburn.Micro;

 

+    using HandBrake.Interop.Interop;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Utilities;

 

@@ -1161,6 +1162,8 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

+        public bool IsHardwareFallbackMode => HandBrakeUtils.IsUsingNoHardwareFallback();

+

         #endregion

 

         #endregion

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 8a04fddeb..31769f4a3 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -259,6 +259,16 @@
 

                     <TextBlock Text="{x:Static Properties:Resources.Options_Video}" FontSize="20" FontFamily="Segoe UI Light" />

 

+                    <Grid Visibility="{Binding IsHardwareFallbackMode, Converter={StaticResource boolToVisConverter}}" Margin="10,5,0,0" Grid.Row="1">

+                        <Grid.ColumnDefinitions>

+                            <ColumnDefinition Width="Auto" />

+                            <ColumnDefinition Width="*" />

+                        </Grid.ColumnDefinitions>

+

+                        <Image Source="Images/ErrorX.png" Width="32" Height="32" VerticalAlignment="Center" Margin="0,0,10,0" Grid.Column="0" />

+                        <TextBlock Text="{x:Static Properties:Resources.OptionsView_HardwareDetectFailed}" TextWrapping="Wrap" Grid.Column="1" />

+                    </Grid>

+

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

 

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

@@ -272,8 +282,6 @@
                         <StackPanel Orientation="Vertical" Margin="20,0,0,0">

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

                             <CheckBox Content="{x:Static Properties:Resources.Options_QsvDecodeForNonFullPath}" Visibility="{Binding IsUseQsvDecAvailable, Converter={StaticResource boolToVisConverter}}" IsChecked="{Binding UseQSVDecodeForNonQSVEnc}" />

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

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

                         </StackPanel>

 

                         <TextBlock Text="{x:Static Properties:Resources.Options_Scaling}" FontSize="14" Margin="0,20,0,10" Visibility="Collapsed" />