RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-25 21:01:48 +00:00
Code Issues Releases Wiki Activity

build: merge d3d11va and dxva2 hwaccel checks

Browse Source 
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.
This commit is contained in:
wm4 2016-05-11 14:37:03 +02:00
parent fde20d10bc
commit fd82e14888
5 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/decode/vd_lavc.c
View File

@ -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

2
video/fmt-conversion.c
View File

@ -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

2
video/out/opengl/hwdec.c
View File

@ -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,

18
wscript
View File

@ -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',

6
wscript_build.py
View File

@ -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" ),