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

Don't waste time retrying the same renderer again

Browse Source
This commit is contained in:
Cameron Gutman 2022-04-02 16:14:04 -05:00
parent 9acf5ff0ef
commit a56cb0e88a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -714,10 +714,11 @@ bool FFmpegVideoDecoder::tryInitializeRenderer(const AVCodec* decoder,
} \ } \
} }
#define TRY_SUPPORTED_PIXEL_FORMAT(RENDERER_TYPE) \ #define TRY_SUPPORTED_NON_PREFERRED_PIXEL_FORMAT(RENDERER_TYPE) \
{ \ { \
RENDERER_TYPE renderer; \ RENDERER_TYPE renderer; \
if (renderer.isPixelFormatSupported(params->videoFormat, decoder->pix_fmts[i])) { \ if (decoder->pix_fmts[i] != renderer.getPreferredPixelFormat(params->videoFormat) && \
renderer.isPixelFormatSupported(params->videoFormat, decoder->pix_fmts[i])) { \
if (tryInitializeRenderer(decoder, params, nullptr, \ if (tryInitializeRenderer(decoder, params, nullptr, \
[]() -> IFFmpegRenderer* { return new RENDERER_TYPE(); })) { \ []() -> IFFmpegRenderer* { return new RENDERER_TYPE(); })) { \
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, \ SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, \
@ -762,6 +763,7 @@ bool FFmpegVideoDecoder::tryInitializeRendererForDecoderByName(const char *decod
// Even if it didn't completely deadlock us, the performance would likely be atrocious. // Even if it didn't completely deadlock us, the performance would likely be atrocious.
if (strcmp(decoderName, "h264_mmal") == 0) { if (strcmp(decoderName, "h264_mmal") == 0) {
TRY_PREFERRED_PIXEL_FORMAT(MmalRenderer); TRY_PREFERRED_PIXEL_FORMAT(MmalRenderer);
TRY_SUPPORTED_NON_PREFERRED_PIXEL_FORMAT(MmalRenderer);
// Give up if we can't use MmalRenderer // Give up if we can't use MmalRenderer
return false; return false;
@ -779,9 +781,9 @@ bool FFmpegVideoDecoder::tryInitializeRendererForDecoderByName(const char *decod
// Nothing prefers any of them. Let's see if anyone will tolerate one. // Nothing prefers any of them. Let's see if anyone will tolerate one.
for (int i = 0; decoder->pix_fmts[i] != AV_PIX_FMT_NONE; i++) { for (int i = 0; decoder->pix_fmts[i] != AV_PIX_FMT_NONE; i++) {
#ifdef HAVE_DRM #ifdef HAVE_DRM
TRY_SUPPORTED_PIXEL_FORMAT(DrmRenderer); TRY_SUPPORTED_NON_PREFERRED_PIXEL_FORMAT(DrmRenderer);
#endif #endif
TRY_SUPPORTED_PIXEL_FORMAT(SdlRenderer); TRY_SUPPORTED_NON_PREFERRED_PIXEL_FORMAT(SdlRenderer);
} }
// If we made it here, we couldn't find anything // If we made it here, we couldn't find anything