moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 15:26:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Never negotiate 10-bit profiles without a 10-bit renderer

Browse Source
This commit is contained in:
Cameron Gutman 2024-09-15 15:53:45 -05:00
parent de28eda266
commit 268f8db26b
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/streaming/session.cpp
View File

@ -724,7 +724,23 @@ bool Session::initialize()
m_StreamConfig.width, m_StreamConfig.width,
m_StreamConfig.height, m_StreamConfig.height,
m_StreamConfig.fps); m_StreamConfig.fps);
if (hevcDA != DecoderAvailability::Hardware) { if (hevcDA == DecoderAvailability::None && m_Preferences->enableHdr) {
// Remove all 10-bit HEVC profiles
m_SupportedVideoFormats.removeByMask(VIDEO_FORMAT_MASK_H265 & VIDEO_FORMAT_MASK_10BIT);
// Check if we have 10-bit AV1 support
auto av1DA = getDecoderAvailability(testWindow,
m_Preferences->videoDecoderSelection,
m_Preferences->enableYUV444 ? VIDEO_FORMAT_AV1_HIGH10_444 : VIDEO_FORMAT_AV1_MAIN10,
m_StreamConfig.width,
m_StreamConfig.height,
m_StreamConfig.fps);
if (av1DA == DecoderAvailability::None) {
// Remove all 10-bit AV1 profiles
m_SupportedVideoFormats.removeByMask(VIDEO_FORMAT_MASK_AV1 & VIDEO_FORMAT_MASK_10BIT);
}
}
else if (hevcDA != DecoderAvailability::Hardware) {
// Deprioritize HEVC unless the user forced software decoding and enabled HDR. // Deprioritize HEVC unless the user forced software decoding and enabled HDR.
// We need HEVC in that case because we cannot support 10-bit content with H.264, // We need HEVC in that case because we cannot support 10-bit content with H.264,
// which would ordinarily be prioritized for software decoding performance. // which would ordinarily be prioritized for software decoding performance.
@ -994,6 +1010,9 @@ bool Session::validateLaunch(SDL_Window* testWindow)
emitLaunchWarning(tr("HDR is not supported using the H.264 codec.")); emitLaunchWarning(tr("HDR is not supported using the H.264 codec."));
m_SupportedVideoFormats.removeByMask(VIDEO_FORMAT_MASK_10BIT); m_SupportedVideoFormats.removeByMask(VIDEO_FORMAT_MASK_10BIT);
} }
else if (!(m_SupportedVideoFormats & VIDEO_FORMAT_MASK_10BIT)) {
emitLaunchWarning(tr("This PC's GPU doesn't support 10-bit HEVC or AV1 decoding for HDR streaming."));
}
// Check that the server GPU supports HDR // Check that the server GPU supports HDR
else if (m_SupportedVideoFormats.maskByServerCodecModes(m_Computer->serverCodecModeSupport & SCM_MASK_10BIT) == 0) { else if (m_SupportedVideoFormats.maskByServerCodecModes(m_Computer->serverCodecModeSupport & SCM_MASK_10BIT) == 0) {
emitLaunchWarning(tr("Your host PC doesn't support HDR streaming.")); emitLaunchWarning(tr("Your host PC doesn't support HDR streaming."));
@ -1040,9 +1059,6 @@ bool Session::validateLaunch(SDL_Window* testWindow)
} }
} }
} }
else if (!(m_SupportedVideoFormats & VIDEO_FORMAT_MASK_10BIT)) {
emitLaunchWarning(tr("This PC's GPU doesn't support 10-bit HEVC or AV1 decoding for HDR streaming."));
}
// Check for compatibility between server and client codecs // Check for compatibility between server and client codecs
if ((m_SupportedVideoFormats & VIDEO_FORMAT_MASK_10BIT) && // Ignore this check if we already failed one above if ((m_SupportedVideoFormats & VIDEO_FORMAT_MASK_10BIT) && // Ignore this check if we already failed one above