Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2025-01-10 02:08:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix leaking /dev/dri fds on each vaInitialize() failure

Browse source
This commit is contained in:
Cameron Gutman 2023-08-01 22:53:22 -05:00
parent 7763ec3c5c
commit d147d36867
2 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/streaming/video/ffmpeg-renderers/vaapi.cpp
View file

@ -130,6 +130,32 @@ VAAPIRenderer::openDisplay(SDL_Window* window)
return display; return display;
} }
VAStatus
VAAPIRenderer::tryVaInitialize(AVVAAPIDeviceContext* vaDeviceContext, PDECODER_PARAMETERS params, int* major, int* minor)
{
VAStatus status;
SDL_assert(vaDeviceContext->display == nullptr);
vaDeviceContext->display = openDisplay(params->window);
if (vaDeviceContext->display == nullptr) {
// openDisplay() logs the error
return VA_STATUS_ERROR_INVALID_DISPLAY;
}
status = vaInitialize(vaDeviceContext->display, major, minor);
if (status != VA_STATUS_SUCCESS) {
// vaInitialize() stores state into the VADisplay even on failure, so we must still
// call vaTerminate() even if vaInitialize() failed. Similarly, calling vaInitialize()
// more than once on the same VADisplay can cause resource leaks, even if it failed
// in the prior call. https://github.com/intel/libva/issues/741
vaTerminate(vaDeviceContext->display);
vaDeviceContext->display = nullptr;
}
return status;
}
bool bool
VAAPIRenderer::initialize(PDECODER_PARAMETERS params) VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
{ {
@ -151,18 +177,12 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data; AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data;
AVVAAPIDeviceContext* vaDeviceContext = (AVVAAPIDeviceContext*)deviceContext->hwctx; AVVAAPIDeviceContext* vaDeviceContext = (AVVAAPIDeviceContext*)deviceContext->hwctx;
vaDeviceContext->display = openDisplay(params->window);
if (vaDeviceContext->display == nullptr) {
// openDisplay() logs the error
return false;
}
int major, minor; int major, minor;
VAStatus status; VAStatus status;
bool setPathVar = false; bool setPathVar = false;
for (;;) { for (;;) {
status = vaInitialize(vaDeviceContext->display, &major, &minor); status = tryVaInitialize(vaDeviceContext, params, &major, &minor);
if (status != VA_STATUS_SUCCESS && qEnvironmentVariableIsEmpty("LIBVA_DRIVER_NAME")) { if (status != VA_STATUS_SUCCESS && qEnvironmentVariableIsEmpty("LIBVA_DRIVER_NAME")) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Trying fallback VAAPI driver names"); "Trying fallback VAAPI driver names");
@ -176,7 +196,7 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
// It should be picked by default on those platforms, but that doesn't // It should be picked by default on those platforms, but that doesn't
// always seem to be the case for some reason. // always seem to be the case for some reason.
qputenv("LIBVA_DRIVER_NAME", "iHD"); qputenv("LIBVA_DRIVER_NAME", "iHD");
status = vaInitialize(vaDeviceContext->display, &major, &minor); status = tryVaInitialize(vaDeviceContext, params, &major, &minor);
} }
if (status != VA_STATUS_SUCCESS) { if (status != VA_STATUS_SUCCESS) {
@ -184,14 +204,14 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
// even though the correct driver is still i965. If we hit this path, we'll // even though the correct driver is still i965. If we hit this path, we'll
// explicitly try i965 to handle this case. // explicitly try i965 to handle this case.
qputenv("LIBVA_DRIVER_NAME", "i965"); qputenv("LIBVA_DRIVER_NAME", "i965");
status = vaInitialize(vaDeviceContext->display, &major, &minor); status = tryVaInitialize(vaDeviceContext, params, &major, &minor);
} }
if (status != VA_STATUS_SUCCESS) { if (status != VA_STATUS_SUCCESS) {
// The RadeonSI driver is compatible with XWayland but can't be detected by libva // The RadeonSI driver is compatible with XWayland but can't be detected by libva
// so try it too if all else fails. // so try it too if all else fails.
qputenv("LIBVA_DRIVER_NAME", "radeonsi"); qputenv("LIBVA_DRIVER_NAME", "radeonsi");
status = vaInitialize(vaDeviceContext->display, &major, &minor); status = tryVaInitialize(vaDeviceContext, params, &major, &minor);
} }
if (status != VA_STATUS_SUCCESS && (m_WindowSystem != SDL_SYSWM_X11 || m_DecoderSelectionPass > 0 || (m_VideoFormat & VIDEO_FORMAT_MASK_AV1))) { if (status != VA_STATUS_SUCCESS && (m_WindowSystem != SDL_SYSWM_X11 || m_DecoderSelectionPass > 0 || (m_VideoFormat & VIDEO_FORMAT_MASK_AV1))) {
@ -199,7 +219,7 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params)
// but we'd rather use CUDA for XWayland and VDPAU for regular X11 and H.264/HEVC. // but we'd rather use CUDA for XWayland and VDPAU for regular X11 and H.264/HEVC.
// We will prefer VAAPI for AV1 because older libvdpau versions don't support it. // We will prefer VAAPI for AV1 because older libvdpau versions don't support it.
qputenv("LIBVA_DRIVER_NAME", "nvidia"); qputenv("LIBVA_DRIVER_NAME", "nvidia");
status = vaInitialize(vaDeviceContext->display, &major, &minor); status = tryVaInitialize(vaDeviceContext, params, &major, &minor);
} }
if (status != VA_STATUS_SUCCESS) { if (status != VA_STATUS_SUCCESS) {

1
app/streaming/video/ffmpeg-renderers/vaapi.h
View file

@ -61,6 +61,7 @@ public:
private: private:
VADisplay openDisplay(SDL_Window* window); VADisplay openDisplay(SDL_Window* window);
VAStatus tryVaInitialize(AVVAAPIDeviceContext* vaDeviceContext, PDECODER_PARAMETERS params, int* major, int* minor);
void renderOverlay(VADisplay display, VASurfaceID surface, Overlay::OverlayType type); void renderOverlay(VADisplay display, VASurfaceID surface, Overlay::OverlayType type);
#if defined(HAVE_EGL) || defined(HAVE_DRM) #if defined(HAVE_EGL) || defined(HAVE_DRM)