Enable HDR as an experimental option

This commit is contained in:
Cameron Gutman
2019-12-30 18:05:43 -06:00
parent bee622bcad
commit 1313c7b3bf
2 changed files with 12 additions and 9 deletions
+5 -8
View File
@@ -708,20 +708,17 @@ Flickable {
val: StreamingPreferences.VCC_AUTO val: StreamingPreferences.VCC_AUTO
} }
ListElement { ListElement {
text: "Force H.264" text: "H.264"
val: StreamingPreferences.VCC_FORCE_H264 val: StreamingPreferences.VCC_FORCE_H264
} }
ListElement { ListElement {
text: "Force HEVC" text: "HEVC (H.265)"
val: StreamingPreferences.VCC_FORCE_HEVC val: StreamingPreferences.VCC_FORCE_HEVC
} }
// HDR seems to be broken in GFE 3.14.1, and even when that's fixed ListElement {
// we'll probably need to gate this feature on OS support in our text: "HEVC HDR (Experimental)"
// renderers.
/* ListElement {
text: "Force HEVC HDR"
val: StreamingPreferences.VCC_FORCE_HEVC_HDR val: StreamingPreferences.VCC_FORCE_HEVC_HDR
} */ }
} }
// ::onActivated must be used, as it only listens for when the index is changed by a human // ::onActivated must be used, as it only listens for when the index is changed by a human
onActivated : { onActivated : {
+7 -1
View File
@@ -482,7 +482,13 @@ bool Session::validateLaunch(SDL_Window* testWindow)
QStringList warningList; QStringList warningList;
if (m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_FORCE_SOFTWARE) { 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) { if (m_Preferences->unsupportedFps && m_StreamConfig.fps > 60) {