From 1313c7b3bfb353155fffdbeb80642b1e7c748d86 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 30 Dec 2019 18:05:43 -0600
Subject: [PATCH] Enable HDR as an experimental option

---
 app/gui/SettingsView.qml  | 13 +++++--------
 app/streaming/session.cpp |  8 +++++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml
index d29e6ad9..c85d9f08 100644
--- a/app/gui/SettingsView.qml
+++ b/app/gui/SettingsView.qml
@@ -708,20 +708,17 @@ Flickable {
                             val: StreamingPreferences.VCC_AUTO
                         }
                         ListElement {
-                            text: "Force H.264"
+                            text: "H.264"
                             val: StreamingPreferences.VCC_FORCE_H264
                         }
                         ListElement {
-                            text: "Force HEVC"
+                            text: "HEVC (H.265)"
                             val: StreamingPreferences.VCC_FORCE_HEVC
                         }
-                        // HDR seems to be broken in GFE 3.14.1, and even when that's fixed
-                        // we'll probably need to gate this feature on OS support in our
-                        // renderers.
-                        /* ListElement {
-                            text: "Force HEVC HDR"
+                        ListElement {
+                            text: "HEVC HDR (Experimental)"
                             val: StreamingPreferences.VCC_FORCE_HEVC_HDR
-                        } */
+                        }
                     }
                     // ::onActivated must be used, as it only listens for when the index is changed by a human
                     onActivated : {
diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index d1a96f17..d71a6767 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -482,7 +482,13 @@ bool Session::validateLaunch(SDL_Window* testWindow)
     QStringList warningList;
 
     if (m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_FORCE_SOFTWARE) {
-        emitLaunchWarning("Your settings selection to force software decoding may cause poor streaming performance.");
+        if (m_Preferences->videoCodecConfig == StreamingPreferences::VCC_FORCE_HEVC_HDR) {
+            emitLaunchWarning("HDR is not supported with software decoding.");
+            m_StreamConfig.enableHdr = false;
+        }
+        else {
+            emitLaunchWarning("Your settings selection to force software decoding may cause poor streaming performance.");
+        }
     }
 
     if (m_Preferences->unsupportedFps && m_StreamConfig.fps > 60) {