diff options
| author | wm4 <wm4@nowhere> | 2016-05-11 14:37:03 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-05-11 15:40:31 +0200 |
| commit | fd82e14888ae2fb1a7430e1166a048dc03321d49 (patch) | |
| tree | 28ffc9b123bf4dbeb8218181d74d4963836fb0d5 | |
| parent | fde20d10bcacebf61aff42ab1f48ac72023a2aa5 (diff) | |
| download | mpv-fd82e14888ae2fb1a7430e1166a048dc03321d49.tar.bz2 mpv-fd82e14888ae2fb1a7430e1166a048dc03321d49.tar.xz | |
build: merge d3d11va and dxva2 hwaccel checks
We don't have any reason to disable either. Both are loaded dynamically
at runtime anyway. There is also no reason why dxva2 would disappear
from libavcodec any time soon.
| -rw-r--r-- | video/decode/vd_lavc.c | 6 | ||||
| -rw-r--r-- | video/fmt-conversion.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/hwdec.c | 2 | ||||
| -rw-r--r-- | wscript | 18 | ||||
| -rw-r--r-- | wscript_build.py | 6 |
5 files changed, 11 insertions, 23 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index bc70b7d348..75ca1f0229 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -154,14 +154,10 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { &mp_vd_lavc_vaapi, &mp_vd_lavc_vaapi_copy, #endif -#if HAVE_D3D11VA_HWACCEL +#if HAVE_D3D_HWACCEL &mp_vd_lavc_d3d11va, -#endif -#if HAVE_DXVA2_HWACCEL &mp_vd_lavc_dxva2, &mp_vd_lavc_dxva2_copy, -#endif -#if HAVE_D3D11VA_HWACCEL &mp_vd_lavc_d3d11va_copy, #endif #if HAVE_ANDROID diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 0a64bae83b..1fca8bfacf 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -109,7 +109,7 @@ static const struct { #endif {IMGFMT_VAAPI, AV_PIX_FMT_VAAPI_VLD}, {IMGFMT_DXVA2, AV_PIX_FMT_DXVA2_VLD}, -#if HAVE_D3D11VA_HWACCEL +#if HAVE_D3D_HWACCEL {IMGFMT_D3D11VA, AV_PIX_FMT_D3D11VA_VLD}, #endif #if HAVE_AV_PIX_FMT_MMAL diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c index fee4a16059..1f654fc1ec 100644 --- a/video/out/opengl/hwdec.c +++ b/video/out/opengl/hwdec.c @@ -46,7 +46,7 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = { #if HAVE_VIDEOTOOLBOX_GL &gl_hwdec_videotoolbox, #endif -#if HAVE_DXVA2_HWACCEL +#if HAVE_D3D_HWACCEL #if HAVE_EGL_ANGLE &gl_hwdec_d3d11egl, &gl_hwdec_dxva2egl, @@ -856,20 +856,12 @@ hwaccel_features = [ 'av_vdpau_bind_context(0,0,0,AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH)', use='libav'), }, { - 'name': '--dxva2-hwaccel', - 'desc': 'libavcodec DXVA2 hwaccel', + 'name': '--d3d-hwaccel', + 'desc': 'libavcodec DXVA2 and D3D11VA hwaccel', 'deps': [ 'win32' ], - 'func': check_headers('libavcodec/dxva2.h', use='libav'), - }, { - 'name': '--d3d11va-hwaccel', - 'desc': 'libavcodec D3D11VA hwaccel', - 'deps': [ 'win32' ], - 'func': check_headers('libavcodec/d3d11va.h', use='libav'), - }, { - 'name': 'd3d-hwaccel', - 'desc': 'Direct3D hwaccel', - 'deps_any': [ 'dxva2-hwaccel', 'd3d11va-hwaccel' ], - 'func': check_true + 'func': compose_checks( + check_headers('libavcodec/dxva2.h', use='libav'), + check_headers('libavcodec/d3d11va.h', use='libav')), }, { 'name': 'sse4-intrinsics', 'desc': 'GCC SSE4 intrinsics for GPU memcpy', diff --git a/wscript_build.py b/wscript_build.py index 66f733a182..9335f05cb4 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -286,13 +286,13 @@ def build(ctx): ( "video/mp_image.c" ), ( "video/mp_image_pool.c" ), ( "video/sws_utils.c" ), - ( "video/dxva2.c", "dxva2-hwaccel" ), + ( "video/dxva2.c", "d3d-hwaccel" ), ( "video/vaapi.c", "vaapi" ), ( "video/vdpau.c", "vdpau" ), ( "video/vdpau_mixer.c", "vdpau" ), ( "video/decode/dec_video.c"), - ( "video/decode/dxva2.c", "dxva2-hwaccel" ), - ( "video/decode/d3d11va.c", "d3d11va-hwaccel" ), + ( "video/decode/dxva2.c", "d3d-hwaccel" ), + ( "video/decode/d3d11va.c", "d3d-hwaccel" ), ( "video/decode/d3d.c", "d3d-hwaccel" ), ( "video/decode/vaapi.c", "vaapi-hwaccel" ), ( "video/decode/vd_lavc.c" ), |