diff options
author | wm4 <wm4@nowhere> | 2017-12-01 08:13:24 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-12-01 17:58:56 +0100 |
commit | 1e4454090683b4cbc20f4422a531eb363ad76092 (patch) | |
tree | 8dc8e95551fac84ba48b47fe22c67ea414e9cc33 /video/decode/vd_lavc.c | |
parent | b89f5084cc58362f53220b8135808bf6b1048962 (diff) | |
download | mpv-1e4454090683b4cbc20f4422a531eb363ad76092.tar.bz2 mpv-1e4454090683b4cbc20f4422a531eb363ad76092.tar.xz |
vd_lavc: delete hw_d3d11va.c/hw_dxva2.c and merge leftovers
Like with all hwaccels, there's little that is actually specific to
decoding (which has been moved away anyway), and what is left are
declarations (which will also go away soon).
Diffstat (limited to 'video/decode/vd_lavc.c')
-rw-r--r-- | video/decode/vd_lavc.c | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 1097577c05..1005c131c6 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -125,10 +125,6 @@ const struct m_sub_options vd_lavc_conf = { extern const struct vd_lavc_hwdec mp_vd_lavc_mediacodec; extern const struct vd_lavc_hwdec mp_vd_lavc_mediacodec_copy; -extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2; -extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2_copy; -extern const struct vd_lavc_hwdec mp_vd_lavc_d3d11va; -extern const struct vd_lavc_hwdec mp_vd_lavc_d3d11va_copy; #if HAVE_RPI static const struct vd_lavc_hwdec mp_vd_lavc_rpi = { @@ -245,6 +241,44 @@ static const struct vd_lavc_hwdec mp_vd_lavc_videotoolbox_copy = { }; #endif +#if HAVE_D3D_HWACCEL +static const struct vd_lavc_hwdec mp_vd_lavc_d3d11va = { + .type = HWDEC_D3D11VA, + .image_format = IMGFMT_D3D11VA, + .generic_hwaccel = true, + .set_hwframes = true, +}; +static const struct vd_lavc_hwdec mp_vd_lavc_d3d11va_copy = { + .type = HWDEC_D3D11VA_COPY, + .copying = true, + .image_format = IMGFMT_D3D11VA, + .generic_hwaccel = true, + .create_standalone_dev = true, + .create_standalone_dev_type = AV_HWDEVICE_TYPE_D3D11VA, + .set_hwframes = true, + .delay_queue = HWDEC_DELAY_QUEUE_COUNT, +}; +#endif + +#if HAVE_D3D9_HWACCEL +static const struct vd_lavc_hwdec mp_vd_lavc_dxva2 = { + .type = HWDEC_DXVA2, + .image_format = IMGFMT_DXVA2, + .generic_hwaccel = true, + .set_hwframes = true, +}; +static const struct vd_lavc_hwdec mp_vd_lavc_dxva2_copy = { + .type = HWDEC_DXVA2_COPY, + .copying = true, + .image_format = IMGFMT_DXVA2, + .generic_hwaccel = true, + .create_standalone_dev = true, + .create_standalone_dev_type = AV_HWDEVICE_TYPE_DXVA2, + .set_hwframes = true, + .delay_queue = HWDEC_DELAY_QUEUE_COUNT, +}; +#endif + static const struct vd_lavc_hwdec *const hwdec_list[] = { #if HAVE_D3D_HWACCEL &mp_vd_lavc_d3d11va, |