From 710872bc22c772d1ea8eb9a0383f5755dae08698 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 27 Sep 2015 20:09:10 +0200 Subject: vaapi: remove dependency on X11 There are at least 2 ways of using VAAPI without X11 (Wayland, DRM). Remove the X11 requirement from the decoder part and the EGL interop. This will be used by a following commit, which adds Wayland support. The worst about this is the decoder part, which includes a bad hack for using the decoder without any VO interop (also known as "vaapi-copy" mode). Separate the X11 parts so that they're self-contained. For the EGL interop code we do something similar (it's kept slightly simpler, because it essentially only has to translate between our silly MPGetNativeDisplay abstraction and the vaGetDisplay...() call). --- wscript_build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wscript_build.py') diff --git a/wscript_build.py b/wscript_build.py index 1d32b1a922..987ad2cec4 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -320,7 +320,7 @@ def build(ctx): ( "video/out/opengl/rpi.c", "rpi" ), ( "video/out/opengl/hwdec.c", "gl" ), ( "video/out/opengl/hwdec_dxva2.c", "gl-win32" ), - ( "video/out/opengl/hwdec_vaegl.c", "vaapi-x-egl" ), + ( "video/out/opengl/hwdec_vaegl.c", "vaapi-egl" ), ( "video/out/opengl/hwdec_vaglx.c", "vaapi-glx" ), ( "video/out/opengl/hwdec_vda.c", "videotoolbox-vda-gl" ), ( "video/out/opengl/hwdec_vdpau.c", "vdpau-gl-x11" ), @@ -344,7 +344,7 @@ def build(ctx): ( "video/out/vo_opengl.c", "gl" ), ( "video/out/vo_opengl_cb.c", "gl" ), ( "video/out/vo_sdl.c", "sdl2" ), - ( "video/out/vo_vaapi.c", "vaapi" ), + ( "video/out/vo_vaapi.c", "vaapi-x11" ), ( "video/out/vo_vdpau.c", "vdpau" ), ( "video/out/vo_wayland.c", "wayland" ), ( "video/out/vo_xv.c", "xv" ), -- cgit v1.2.3