diff options
author | wm4 <wm4@nowhere> | 2017-03-23 11:06:28 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-03-23 11:14:11 +0100 |
commit | a52a52fa6ec4265a2aeb39d775f46ebc928fe8c7 (patch) | |
tree | 2b1bf1963abecc291a35ef032f9be34e438b648a /video/vdpau.c | |
parent | b0cbda84ed923c8915642443b7cf5de5a2ba7b26 (diff) | |
download | mpv-a52a52fa6ec4265a2aeb39d775f46ebc928fe8c7.tar.bz2 mpv-a52a52fa6ec4265a2aeb39d775f46ebc928fe8c7.tar.xz |
vdpau: support new vdpau libavcodec decode API
The new API works like the new vaapi API, using generic hwaccel support.
One minor detail is the error message that will be printed if using
non-4:2:0 surfaces (which as far as I can tell is completely broken in
the nVidia drivers and thus not supported by mpv). The HEVC warning
(which is completely broken in the nVidia drivers but should work with
Mesa) had to be added to the generic hwaccel code.
This also trashes display preemption recovery. Fuck that. It never
really worked. If someone complains, I might attempt to add it back
somehow.
This is the 4th iteration of the libavcodec vdpau API (after the
separate decoder API, the manual hwaccel API, and the automatic vdpau
hwaccel API). Fortunately, further iterations will be generic, and not
require much vdpau-specific changes (if any at all).
Diffstat (limited to 'video/vdpau.c')
-rw-r--r-- | video/vdpau.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/video/vdpau.c b/video/vdpau.c index f4c85a0bab..8895053249 100644 --- a/video/vdpau.c +++ b/video/vdpau.c @@ -605,3 +605,31 @@ bool mp_vdpau_guess_if_emulated(struct mp_vdpau_ctx *ctx) CHECK_VDP_WARNING(ctx, "Error when calling vdp_get_information_string"); return vdp_st == VDP_STATUS_OK && info && strstr(info, "VAAPI"); } + +static void vdpau_destroy_standalone(struct mp_hwdec_ctx *ctx) +{ + struct mp_vdpau_ctx *vdp = ctx->ctx; + Display *display = vdp->x11; + mp_vdpau_destroy(vdp); + XCloseDisplay(display); +} + +struct mp_hwdec_ctx *vdpau_create_standalone(struct mpv_global *global, + struct mp_log *plog, bool probing) +{ + XInitThreads(); + + Display *display = XOpenDisplay(NULL); + if (!display) + return NULL; + + struct mp_vdpau_ctx *vdp = mp_vdpau_create_device_x11(plog, display, probing); + if (!vdp) { + XCloseDisplay(display); + return NULL; + } + + vdp->hwctx.emulated = mp_vdpau_guess_if_emulated(vdp); + vdp->hwctx.destroy = vdpau_destroy_standalone; + return &vdp->hwctx; +} |