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

Give up immediately if the backend fails to initialize

Browse Source
This commit is contained in:
Cameron Gutman 2025-02-18 19:46:29 -06:00
parent fd70865026
commit 4c5bcee8dc
1 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
app/streaming/video/ffmpeg.cpp
View File

@ -1063,56 +1063,68 @@ bool FFmpegVideoDecoder::tryInitializeRenderer(const AVCodec* decoder,
// i == 0 - Indirect via EGL or DRM frontend with zero-copy DMA-BUF passing // i == 0 - Indirect via EGL or DRM frontend with zero-copy DMA-BUF passing
// i == 1 - Direct rendering or indirect via SDL read-back // i == 1 - Direct rendering or indirect via SDL read-back
bool backendInitFailure = false;
#ifdef HAVE_EGL #ifdef HAVE_EGL
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2 && !backendInitFailure; i++) {
#else #else
for (int i = 1; i < 2; i++) { for (int i = 1; i < 2 && !backendInitFailure; i++) {
#endif #endif
SDL_assert(m_BackendRenderer == nullptr); SDL_assert(m_BackendRenderer == nullptr);
if ((m_BackendRenderer = createRendererFunc()) != nullptr &&
initializeRendererInternal(m_BackendRenderer, (m_TestOnly || m_BackendRenderer->needsTestFrame()) ? &testFrameDecoderParams : params) && if ((m_BackendRenderer = createRendererFunc()) == nullptr) {
completeInitialization(decoder, requiredFormat, // Out of memory
break;
}
// Initialize the backend renderer itself
if (initializeRendererInternal(m_BackendRenderer, (m_TestOnly || m_BackendRenderer->needsTestFrame()) ? &testFrameDecoderParams : params)) {
if (completeInitialization(decoder, requiredFormat,
(m_TestOnly || m_BackendRenderer->needsTestFrame()) ? &testFrameDecoderParams : params, (m_TestOnly || m_BackendRenderer->needsTestFrame()) ? &testFrameDecoderParams : params,
m_TestOnly || m_BackendRenderer->needsTestFrame(), m_TestOnly || m_BackendRenderer->needsTestFrame(),
i == 0 /* EGL/DRM */)) { i == 0 /* EGL/DRM */)) {
if (m_TestOnly) { if (m_TestOnly) {
// This decoder is only for testing capabilities, so don't bother // This decoder is only for testing capabilities, so don't bother
// creating a usable renderer // creating a usable renderer
return true;
}
if (m_BackendRenderer->needsTestFrame()) {
// The test worked, so now let's initialize it for real
reset();
if ((m_BackendRenderer = createRendererFunc()) != nullptr &&
initializeRendererInternal(m_BackendRenderer, params) &&
completeInitialization(decoder, requiredFormat, params, false, i == 0 /* EGL/DRM */)) {
return true; return true;
} }
else {
SDL_LogCritical(SDL_LOG_CATEGORY_APPLICATION,
"Decoder failed to initialize after successful test");
if (m_BackendRenderer != nullptr && failureReason != nullptr) { if (m_BackendRenderer->needsTestFrame()) {
*failureReason = m_BackendRenderer->getInitFailureReason(); // The test worked, so now let's initialize it for real
reset();
if ((m_BackendRenderer = createRendererFunc()) == nullptr) {
// Out of memory
break;
} }
reset(); if (initializeRendererInternal(m_BackendRenderer, params) &&
completeInitialization(decoder, requiredFormat, params, false, i == 0 /* EGL/DRM */)) {
return true;
}
else {
SDL_LogCritical(SDL_LOG_CATEGORY_APPLICATION,
"Decoder failed to initialize after successful test");
}
}
else {
// No test required. Good to go now.
return true;
} }
}
else {
// No test required. Good to go now.
return true;
} }
} }
else { else {
if (m_BackendRenderer != nullptr && failureReason != nullptr) { // If we failed to initialize the backend entirely, there's no sense in trying
*failureReason = m_BackendRenderer->getInitFailureReason(); // a different frontend renderer as it won't make a difference.
} backendInitFailure = true;
// Failed to initialize, so keep looking
reset();
} }
auto backendFailureReason = m_BackendRenderer->getInitFailureReason();
if (failureReason != nullptr) {
*failureReason = backendFailureReason;
}
reset();
} }
// reset() must be called before we reach this point! // reset() must be called before we reach this point!