Add note in Encoding Settings if on Vista with QSV compatible hardware

jp9000 · Sep 25, 2014 · 89b560b · 89b560b
1 parent a976a2c
commit 89b560b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/OBS.rc b/OBS.rc
@@ -142,6 +142,7 @@ BEGIN
     COMBOBOX        IDC_AUDIOCHANNEL,354,115,61,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Settings.Info",IDC_INFO,4,288,417,37,NOT WS_VISIBLE
     LTEXT           "Settings.Encoding.Video.QSVConfigWarning",IDC_QSV_CONFIG_WARNING,4,141,417,37
+    LTEXT           "Settings.Encoding.Video.QSVWinVerWarning",IDC_QSV_WINVER_WARNING,4,141,417,37
 END
 
 IDD_SETTINGS_VIDEO DIALOGEX 0, 0, 427, 336

diff --git a/Source/Encoder_QSV.cpp b/Source/Encoder_QSV.cpp
@@ -359,6 +359,19 @@ bool CheckQSVHardwareSupport(bool log=true, bool *configurationWarning = nullptr
     return false;
 }
 
+bool IsKnownQSVCPUPlatform()
+{
+    static qsv_cpu_platform plat = qsv_get_cpu_platform();
+    switch (plat)
+    {
+    case QSV_CPU_PLATFORM_SNB:
+    case QSV_CPU_PLATFORM_IVB:
+    case QSV_CPU_PLATFORM_HSW:
+        return true;
+    }
+    return false;
+}
+
 bool QSVMethodAvailable(decltype(mfxInfoMFX::RateControlMethod) method)
 {
     static qsv_cpu_platform plat = qsv_get_cpu_platform();

diff --git a/Source/SettingsEncoding.cpp b/Source/SettingsEncoding.cpp
@@ -19,6 +19,7 @@
 
 #include "Settings.h"
 
+bool IsKnownQSVCPUPlatform();
 bool CheckQSVHardwareSupport(bool log, bool *configurationWarning=nullptr);
 bool CheckNVENCHardwareSupport(bool log);
 
@@ -168,7 +169,9 @@ INT_PTR SettingsEncoding::ProcMessage(UINT message, WPARAM wParam, LPARAM lParam
                 EnableWindow(GetDlgItem(hwnd, IDC_ENCODERQSV), hasQSV || useQSV);
                 EnableWindow(GetDlgItem(hwnd, IDC_ENCODERNVENC), hasNVENC || useNVENC);
 
-                ShowWindow(GetDlgItem(hwnd, IDC_QSV_CONFIG_WARNING), showQSVConfigurationWarning ? SW_SHOW : SW_HIDE);
+                bool QSVOnUnsupportedWinVer = OSGetVersion() < 7 && IsKnownQSVCPUPlatform() && !hasQSV;
+                ShowWindow(GetDlgItem(hwnd, IDC_QSV_WINVER_WARNING), QSVOnUnsupportedWinVer ? SW_SHOW : SW_HIDE);
+                ShowWindow(GetDlgItem(hwnd, IDC_QSV_CONFIG_WARNING), !QSVOnUnsupportedWinVer && showQSVConfigurationWarning ? SW_SHOW : SW_HIDE);
 
                 //--------------------------------------------
 

diff --git a/resource.h b/resource.h
@@ -86,6 +86,7 @@
 #define IDC_WARNINGS                    1030
 #define IDC_QSV_CONFIG_WARNING          1030
 #define IDC_FPS_EDIT                    1031
+#define IDC_QSV_WINVER_WARNING          1031
 #define IDC_SIZEX                       1033
 #define IDC_SIZEY                       1034
 #define IDC_GAMMA                       1035

diff --git a/rundir/locale/en.txt b/rundir/locale/en.txt
@@ -276,6 +276,7 @@ Settings.Encoding.Video.QualityTooltip="This setting will attempt to target a ce
 Settings.Encoding.Video.EncoderQSVDisabledAfterApply="The 'Quick Sync' Encoder option will be disabled because your hardware does not seem to support Quick Sync."
 Settings.Encoding.Video.EncoderNVENCDisabledAfterApply="The 'Nvidia NVENC' Encoder option will be disabled because your hardware does not seem to support Nvidia NVENC."
 Settings.Encoding.Video.QSVConfigWarning="To enable the Quick Sync Encoder option make sure your CPU supports Quick Sync and the Intel graphics adapter is enabled in the BIOS. If you are using a laptop check the sticky thread 'Laptop? Black screen when capturing? Read here first.' in the Questions and Help forum."
+Settings.Encoding.Video.QSVWinVerWarning="Quick Sync requires Windows 7 or later."
 
 Settings.General.Add="Add New"
 Settings.General.ConfirmDelete="Are you sure you wish to remove the profile '$1'?"