From 0261c4157405e8897c11d54647b33303d580270f Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 5 Sep 2023 20:39:28 -0500 Subject: [PATCH] Revert "Prefer nvidia-vaapi-driver over VDPAU for AV1" libvdpau 1.5 has supported this for a while and we'll fall back to VAAPI if VDPAU doesn't work. This reverts commit 42960b7bf149f3dbd9e47f18792c07f2d182408a. --- app/streaming/video/ffmpeg-renderers/vaapi.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/vaapi.cpp b/app/streaming/video/ffmpeg-renderers/vaapi.cpp index 8bcacdd2..e8d7d394 100644 --- a/app/streaming/video/ffmpeg-renderers/vaapi.cpp +++ b/app/streaming/video/ffmpeg-renderers/vaapi.cpp @@ -214,10 +214,9 @@ VAAPIRenderer::initialize(PDECODER_PARAMETERS params) 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)) { // The unofficial nvidia VAAPI driver over NVDEC/CUDA works well on Wayland, - // 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. + // but we'd rather use CUDA for XWayland and VDPAU for regular X11. qputenv("LIBVA_DRIVER_NAME", "nvidia"); status = tryVaInitialize(vaDeviceContext, params, &major, &minor); }