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

Update workaround to prevent deadlock with h264_mmal

Browse Source
This commit is contained in:
Cameron Gutman 2022-04-02 16:06:39 -05:00
parent 64a7790aed
commit 9acf5ff0ef
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -757,19 +757,23 @@ bool FFmpegVideoDecoder::tryInitializeRendererForDecoderByName(const char *decod
[]() -> IFFmpegRenderer* { return new SdlRenderer(); }); []() -> IFFmpegRenderer* { return new SdlRenderer(); });
} }
#ifdef HAVE_MMAL
// HACK: Avoid using YUV420P on h264_mmal. It can cause a deadlock inside the MMAL libraries.
// Even if it didn't completely deadlock us, the performance would likely be atrocious.
if (strcmp(decoderName, "h264_mmal") == 0) {
TRY_PREFERRED_PIXEL_FORMAT(MmalRenderer);
// Give up if we can't use MmalRenderer
return false;
}
#endif
// Check if any of our decoders prefer any of the pixel formats first // Check if any of our decoders prefer any of the pixel formats first
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_PREFERRED_PIXEL_FORMAT(DrmRenderer); TRY_PREFERRED_PIXEL_FORMAT(DrmRenderer);
#endif #endif
#ifdef HAVE_MMAL TRY_PREFERRED_PIXEL_FORMAT(SdlRenderer);
TRY_PREFERRED_PIXEL_FORMAT(MmalRenderer);
#endif
// HACK: Avoid using YUV420P on h264_mmal. It can cause a deadlock inside the MMAL libraries.
// Even if it didn't completely deadlock us, the performance would likely be atrocious.
if (strcmp(decoderName, "h264_mmal") != 0) {
TRY_PREFERRED_PIXEL_FORMAT(SdlRenderer);
}
} }
// 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.
@ -777,13 +781,7 @@ bool FFmpegVideoDecoder::tryInitializeRendererForDecoderByName(const char *decod
#ifdef HAVE_DRM #ifdef HAVE_DRM
TRY_SUPPORTED_PIXEL_FORMAT(DrmRenderer); TRY_SUPPORTED_PIXEL_FORMAT(DrmRenderer);
#endif #endif
#ifdef HAVE_MMAL TRY_SUPPORTED_PIXEL_FORMAT(SdlRenderer);
TRY_SUPPORTED_PIXEL_FORMAT(MmalRenderer);
#endif
// HACK: See comment above
if (strcmp(decoderName, "h264_mmal") != 0) {
TRY_SUPPORTED_PIXEL_FORMAT(SdlRenderer);
}
} }
// If we made it here, we couldn't find anything // If we made it here, we couldn't find anything