From 292724538cfbe2a6c713420f8b5be0abf75ad46c Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 2 Dec 2017 04:33:43 +0100 Subject: 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. --- video/out/d3d11/hwdec_d3d11va.c | 5 +---- video/out/opengl/hwdec_d3d11egl.c | 5 +---- video/out/opengl/hwdec_d3d11eglrgb.c | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'video/out') diff --git a/video/out/d3d11/hwdec_d3d11va.c b/video/out/d3d11/hwdec_d3d11va.c index 1be79a3748..d83fdc57af 100644 --- a/video/out/d3d11/hwdec_d3d11va.c +++ b/video/out/d3d11/hwdec_d3d11va.c @@ -66,8 +66,7 @@ struct priv { static void uninit(struct ra_hwdec *hw) { struct priv_owner *p = hw->priv; - if (p->hwctx.ctx) - hwdec_devices_remove(hw->devs, &p->hwctx); + hwdec_devices_remove(hw->devs, &p->hwctx); SAFE_RELEASE(p->device); SAFE_RELEASE(p->device1); } @@ -106,9 +105,7 @@ static int init(struct ra_hwdec *hw) ID3D10Multithread_Release(multithread); p->hwctx = (struct mp_hwdec_ctx){ - .type = HWDEC_D3D11VA, .driver_name = hw->driver->name, - .ctx = p->device, .av_device_ref = d3d11_wrap_device_ref(p->device), }; hwdec_devices_add(hw->devs, &p->hwctx); diff --git a/video/out/opengl/hwdec_d3d11egl.c b/video/out/opengl/hwdec_d3d11egl.c index e2b188f4b5..e7416330d7 100644 --- a/video/out/opengl/hwdec_d3d11egl.c +++ b/video/out/opengl/hwdec_d3d11egl.c @@ -75,8 +75,7 @@ static void uninit(struct ra_hwdec *hw) { struct priv_owner *p = hw->priv; - if (p->hwctx.ctx) - hwdec_devices_remove(hw->devs, &p->hwctx); + hwdec_devices_remove(hw->devs, &p->hwctx); if (p->d3d11_device) ID3D11Device_Release(p->d3d11_device); @@ -180,9 +179,7 @@ static int init(struct ra_hwdec *hw) ID3D10Multithread_Release(multithread); p->hwctx = (struct mp_hwdec_ctx){ - .type = HWDEC_D3D11VA, .driver_name = hw->driver->name, - .ctx = p->d3d11_device, .av_device_ref = d3d11_wrap_device_ref(p->d3d11_device), }; hwdec_devices_add(hw->devs, &p->hwctx); diff --git a/video/out/opengl/hwdec_d3d11eglrgb.c b/video/out/opengl/hwdec_d3d11eglrgb.c index 78bc38e93e..c8f6580320 100644 --- a/video/out/opengl/hwdec_d3d11eglrgb.c +++ b/video/out/opengl/hwdec_d3d11eglrgb.c @@ -54,8 +54,7 @@ static void uninit(struct ra_hwdec *hw) { struct priv_owner *p = hw->priv; - if (p->hwctx.ctx) - hwdec_devices_remove(hw->devs, &p->hwctx); + hwdec_devices_remove(hw->devs, &p->hwctx); if (p->d3d11_device) ID3D11Device_Release(p->d3d11_device); @@ -137,9 +136,7 @@ static int init(struct ra_hwdec *hw) } p->hwctx = (struct mp_hwdec_ctx){ - .type = HWDEC_D3D11VA, .driver_name = hw->driver->name, - .ctx = p->d3d11_device, .av_device_ref = d3d11_wrap_device_ref(p->d3d11_device), }; hwdec_devices_add(hw->devs, &p->hwctx); -- cgit v1.2.3