From fbcd9c140fb3fc5435c8c0a0f3189e4d972762ed Mon Sep 17 00:00:00 2001 From: Aaron Boxer Date: Thu, 22 Sep 2022 14:36:38 -0400 Subject: [PATCH] mp_imgfmt: move DRMPRIME format to end of enum dmabuf-wayland vo supports both DRMPRIME and VAAPI formats. If upload filter is needed, we want to try VAAPI hwdec first since most users will be using VAAPI, and there is a several second delay when DRMPRIME hwdec is tried and fails. --- video/img_format.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/video/img_format.h b/video/img_format.h index 7559c8c172..f493267f97 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -276,7 +276,6 @@ enum mp_imgfmt { IMGFMT_DXVA2, // IDirect3DSurface9 (NV12/P010/P016) IMGFMT_MMAL, // MMAL_BUFFER_HEADER_T IMGFMT_MEDIACODEC, // AVMediaCodecBuffer - IMGFMT_DRMPRIME, // AVDRMFrameDescriptor IMGFMT_CUDA, // CUDA Buffer // Not an actual format; base for mpv-specific descriptor table. @@ -320,6 +319,7 @@ enum mp_imgfmt { IMGFMT_VAAPI, IMGFMT_VIDEOTOOLBOX, // CVPixelBufferRef IMGFMT_VULKAN, // VKImage + IMGFMT_DRMPRIME, // AVDRMFrameDescriptor // Generic pass-through of AV_PIX_FMT_*. Used for formats which don't have // a corresponding IMGFMT_ value.