summaryrefslogtreecommitdiffstats
path: root/video/filter/vf_d3d11vpp.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-12-02 04:33:43 +0100
committerwm4 <wm4@nowhere>2017-12-02 04:53:55 +0100
commit292724538cfbe2a6c713420f8b5be0abf75ad46c (patch)
treee1bb9a2a16e347f0de3075792d18492b3dd4852c /video/filter/vf_d3d11vpp.c
parent23a9efd124042e7c97f8317bcd8ae5903d039ef7 (diff)
downloadmpv-292724538cfbe2a6c713420f8b5be0abf75ad46c.tar.bz2
mpv-292724538cfbe2a6c713420f8b5be0abf75ad46c.tar.xz
video: remove some more hwdec legacy stuff
Finally get rid of all the HWDEC_* things, and instead rely on the libavutil equivalents. vdpau still uses a shitty hack, but fuck the vdpau code. Remove all the now unneeded remains. The vdpau preemption thing was not unused anymore; if someone cares this could probably be restored.
Diffstat (limited to 'video/filter/vf_d3d11vpp.c')
-rw-r--r--video/filter/vf_d3d11vpp.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/video/filter/vf_d3d11vpp.c b/video/filter/vf_d3d11vpp.c
index cafa5df122..f49af06424 100644
--- a/video/filter/vf_d3d11vpp.c
+++ b/video/filter/vf_d3d11vpp.c
@@ -19,6 +19,9 @@
#include <windows.h>
#include <d3d11.h>
+#include <libavutil/hwcontext.h>
+#include <libavutil/hwcontext_d3d11va.h>
+
#include "common/common.h"
#include "osdep/timer.h"
#include "osdep/windows_utils.h"
@@ -477,6 +480,9 @@ static int vf_open(vf_instance_t *vf)
{
struct vf_priv_s *p = vf->priv;
+ if (!vf->hwdec_devs)
+ return 0;
+
vf->reconfig = reconfig;
vf->filter_ext = filter_ext;
vf->filter_out = filter_out;
@@ -484,14 +490,22 @@ static int vf_open(vf_instance_t *vf)
vf->uninit = uninit;
vf->control = control;
- p->queue = mp_refqueue_alloc();
-
- p->vo_dev = hwdec_devices_load(vf->hwdec_devs, HWDEC_D3D11VA);
- if (!p->vo_dev)
+ hwdec_devices_request_all(vf->hwdec_devs);
+ AVBufferRef *ref =
+ hwdec_devices_get_lavc(vf->hwdec_devs, AV_HWDEVICE_TYPE_D3D11VA);
+ if (!ref)
return 0;
+ AVHWDeviceContext *hwctx = (void *)ref->data;
+ AVD3D11VADeviceContext *d3dctx = hwctx->hwctx;
+
+ p->vo_dev = d3dctx->device;
ID3D11Device_AddRef(p->vo_dev);
+ av_buffer_unref(&ref);
+
+ p->queue = mp_refqueue_alloc();
+
HRESULT hr;
hr = ID3D11Device_QueryInterface(p->vo_dev, &IID_ID3D11VideoDevice,