RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-02 05:01:56 +00:00
Code Issues Releases Wiki Activity

hwdec_cuda: Rename config variable to be more consistent

Browse Source 
'cuda-gl' isn't right - you can turn this on without any GL and
get some non-zero benefit (with the cuda-copy hwaccel). So
'cuda-hwaccel' seems more consistent with everything else.
This commit is contained in:
Philip Langdale 2016-09-15 20:15:36 -07:00 committed by wm4
parent cf5c3fc31a
commit b83bfea05d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
video/decode/vd_lavc.c
View File

@ -151,7 +151,7 @@ static const struct vd_lavc_hwdec mp_vd_lavc_mediacodec = {
};
#endif
#if HAVE_CUDA_GL
#if HAVE_CUDA_HWACCEL
static const struct vd_lavc_hwdec mp_vd_lavc_cuda_copy = {
.type = HWDEC_CUDA_COPY,
.lavc_suffix = "_cuvid",
@ -183,7 +183,7 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
#if HAVE_ANDROID
&mp_vd_lavc_mediacodec,
#endif
#if HAVE_CUDA_GL
#if HAVE_CUDA_HWACCEL
&mp_vd_lavc_cuda,
&mp_vd_lavc_cuda_copy,
#endif

2
video/fmt-conversion.c
View File

@ -115,7 +115,7 @@ static const struct {
#if HAVE_AV_PIX_FMT_MMAL
{IMGFMT_MMAL, AV_PIX_FMT_MMAL},
#endif
#if HAVE_CUDA_GL
#if HAVE_CUDA_HWACCEL
{IMGFMT_CUDA, AV_PIX_FMT_CUDA},
#endif
#ifdef AV_PIX_FMT_P010

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

@ -60,7 +60,7 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = {
#endif
&gl_hwdec_dxva2,
#endif
#if HAVE_CUDA_GL
#if HAVE_CUDA_HWACCEL
&gl_hwdec_cuda,
#endif
#if HAVE_RPI

4
wscript
View File

@ -886,8 +886,8 @@ hwaccel_features = [
check_headers('libavcodec/dxva2.h', use='libav'),
check_headers('libavcodec/d3d11va.h', use='libav')),
}, {
'name': '--cuda-gl',
'desc': 'CUDA with OpenGL',
'name': '--cuda-hwaccel',
'desc': 'CUDA hwaccel',
'func': compose_checks(
check_cc(lib="cuda"),
check_headers('libavutil/hwcontext_cuda.h', use='libav')),

4
wscript_build.py
View File

@ -290,7 +290,7 @@ def build(ctx):
( "video/vdpau.c", "vdpau" ),
( "video/vdpau_mixer.c", "vdpau" ),
( "video/decode/dec_video.c"),
( "video/decode/cuda.c", "cuda-gl" ),
( "video/decode/cuda.c", "cuda-hwaccel" ),
( "video/decode/dxva2.c", "d3d-hwaccel" ),
( "video/decode/d3d11va.c", "d3d-hwaccel" ),
( "video/decode/d3d.c", "win32" ),
@ -347,7 +347,7 @@ def build(ctx):
( "video/out/opengl/egl_helpers.c", "egl-helpers" ),
( "video/out/opengl/formats.c", "gl" ),
( "video/out/opengl/hwdec.c", "gl" ),
( "video/out/opengl/hwdec_cuda.c", "cuda-gl" ),
( "video/out/opengl/hwdec_cuda.c", "cuda-hwaccel" ),
( "video/out/opengl/hwdec_d3d11egl.c", "egl-angle" ),
( "video/out/opengl/hwdec_d3d11eglrgb.c","egl-angle" ),
( "video/out/opengl/hwdec_dxva2.c", "gl-win32" ),