jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use SdlRenderer with MMAL

Browse source
This commit is contained in:
Cameron Gutman 2021-12-19 20:58:50 -06:00
commit d8acf24af0
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/streaming/video/ffmpeg.cpp
View file

@ -709,7 +709,11 @@ bool FFmpegVideoDecoder::tryInitializeRendererForDecoderByName(const char *decod
#ifdef HAVE_MMAL #ifdef HAVE_MMAL
TRY_PREFERRED_PIXEL_FORMAT(MmalRenderer); TRY_PREFERRED_PIXEL_FORMAT(MmalRenderer);
#endif #endif
TRY_PREFERRED_PIXEL_FORMAT(SdlRenderer); // 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.
@ -720,7 +724,10 @@ bool FFmpegVideoDecoder::tryInitializeRendererForDecoderByName(const char *decod
#ifdef HAVE_MMAL #ifdef HAVE_MMAL
TRY_SUPPORTED_PIXEL_FORMAT(MmalRenderer); TRY_SUPPORTED_PIXEL_FORMAT(MmalRenderer);
#endif #endif
TRY_SUPPORTED_PIXEL_FORMAT(SdlRenderer); // 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