mirror of
https://github.com/moonlight-stream/moonlight-qt.git
synced 2026-06-18 06:30:55 +00:00
Fix spurious HEVC software decode warning if AV1 is forced without HEVC hardware decoding
This commit is contained in:
@@ -995,7 +995,8 @@ bool Session::validateLaunch(SDL_Window* testWindow)
|
|||||||
// check below.
|
// check below.
|
||||||
m_SupportedVideoFormats.removeByMask(VIDEO_FORMAT_MASK_AV1);
|
m_SupportedVideoFormats.removeByMask(VIDEO_FORMAT_MASK_AV1);
|
||||||
}
|
}
|
||||||
else if (!m_Preferences->enableHdr && // HDR is checked below
|
else {
|
||||||
|
if (!m_Preferences->enableHdr && // HDR is checked below
|
||||||
m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO && // Force hardware decoding checked below
|
m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO && // Force hardware decoding checked below
|
||||||
m_Preferences->videoCodecConfig != StreamingPreferences::VCC_AUTO && // Auto VCC is already checked in initialize()
|
m_Preferences->videoCodecConfig != StreamingPreferences::VCC_AUTO && // Auto VCC is already checked in initialize()
|
||||||
getDecoderAvailability(testWindow,
|
getDecoderAvailability(testWindow,
|
||||||
@@ -1006,6 +1007,11 @@ bool Session::validateLaunch(SDL_Window* testWindow)
|
|||||||
m_StreamConfig.fps) != DecoderAvailability::Hardware) {
|
m_StreamConfig.fps) != DecoderAvailability::Hardware) {
|
||||||
emitLaunchWarning(tr("Using software decoding due to your selection to force AV1 without GPU support. This may cause poor streaming performance."));
|
emitLaunchWarning(tr("Using software decoding due to your selection to force AV1 without GPU support. This may cause poor streaming performance."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (m_Preferences->videoCodecConfig == StreamingPreferences::VCC_FORCE_AV1) {
|
||||||
|
m_SupportedVideoFormats.removeByMask(~VIDEO_FORMAT_MASK_AV1);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_SupportedVideoFormats & VIDEO_FORMAT_MASK_H265) {
|
if (m_SupportedVideoFormats & VIDEO_FORMAT_MASK_H265) {
|
||||||
@@ -1019,7 +1025,8 @@ bool Session::validateLaunch(SDL_Window* testWindow)
|
|||||||
// check below.
|
// check below.
|
||||||
m_SupportedVideoFormats.removeByMask(VIDEO_FORMAT_MASK_H265);
|
m_SupportedVideoFormats.removeByMask(VIDEO_FORMAT_MASK_H265);
|
||||||
}
|
}
|
||||||
else if (!m_Preferences->enableHdr && // HDR is checked below
|
else {
|
||||||
|
if (!m_Preferences->enableHdr && // HDR is checked below
|
||||||
m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO && // Force hardware decoding checked below
|
m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO && // Force hardware decoding checked below
|
||||||
m_Preferences->videoCodecConfig != StreamingPreferences::VCC_AUTO && // Auto VCC is already checked in initialize()
|
m_Preferences->videoCodecConfig != StreamingPreferences::VCC_AUTO && // Auto VCC is already checked in initialize()
|
||||||
getDecoderAvailability(testWindow,
|
getDecoderAvailability(testWindow,
|
||||||
@@ -1030,9 +1037,14 @@ bool Session::validateLaunch(SDL_Window* testWindow)
|
|||||||
m_StreamConfig.fps) != DecoderAvailability::Hardware) {
|
m_StreamConfig.fps) != DecoderAvailability::Hardware) {
|
||||||
emitLaunchWarning(tr("Using software decoding due to your selection to force HEVC without GPU support. This may cause poor streaming performance."));
|
emitLaunchWarning(tr("Using software decoding due to your selection to force HEVC without GPU support. This may cause poor streaming performance."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (m_Preferences->videoCodecConfig == StreamingPreferences::VCC_FORCE_HEVC) {
|
||||||
|
m_SupportedVideoFormats.removeByMask(~VIDEO_FORMAT_MASK_H265);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(m_SupportedVideoFormats & VIDEO_FORMAT_MASK_H265) &&
|
if (!(m_SupportedVideoFormats & ~VIDEO_FORMAT_MASK_H264) &&
|
||||||
m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO &&
|
m_Preferences->videoDecoderSelection == StreamingPreferences::VDS_AUTO &&
|
||||||
getDecoderAvailability(testWindow,
|
getDecoderAvailability(testWindow,
|
||||||
m_Preferences->videoDecoderSelection,
|
m_Preferences->videoDecoderSelection,
|
||||||
|
|||||||
Reference in New Issue
Block a user