summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-28 19:59:08 +0200
committerwm4 <wm4@nowhere>2017-10-28 19:59:08 +0200
commit6b745769b1fd15ba03edad3fe381abb745bf9907 (patch)
tree393cba00ce5561df576bb6d1d5507cefca870d18 /video
parent3413fe4dfdd61724719e3582aeb91b2523a00b84 (diff)
downloadmpv-6b745769b1fd15ba03edad3fe381abb745bf9907.tar.bz2
mpv-6b745769b1fd15ba03edad3fe381abb745bf9907.tar.xz
vd_lavc: add support for nvdec hwaccel
See manpage additions. (In ffmpeg-mpv and Libav, this is still called "cuvid". Libav won't work yet, because it has no frame params support yet, but this could get fixed soon.)
Diffstat (limited to 'video')
-rw-r--r--video/decode/vd_lavc.c15
-rw-r--r--video/hwdec.h2
-rw-r--r--video/out/gpu/hwdec.c2
-rw-r--r--video/out/opengl/hwdec_cuda.c18
4 files changed, 36 insertions, 1 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index c07c1590fe..6f09908090 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -158,6 +158,19 @@ static const struct vd_lavc_hwdec mp_vd_lavc_rkmpp = {
};
#if HAVE_CUDA_HWACCEL
+static const struct vd_lavc_hwdec mp_vd_lavc_nvdec = {
+ .type = HWDEC_NVDEC,
+ .image_format = IMGFMT_CUDA,
+ .generic_hwaccel = true,
+ .set_hwframes = true,
+};
+static const struct vd_lavc_hwdec mp_vd_lavc_nvdec_copy = {
+ .type = HWDEC_NVDEC_COPY,
+ .image_format = IMGFMT_CUDA,
+ .generic_hwaccel = true,
+ .set_hwframes = true,
+ .copying = true,
+};
static const struct vd_lavc_hwdec mp_vd_lavc_cuda = {
.type = HWDEC_CUDA,
.image_format = IMGFMT_CUDA,
@@ -272,6 +285,8 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
&mp_vd_lavc_mediacodec_copy,
#endif
#if HAVE_CUDA_HWACCEL
+ &mp_vd_lavc_nvdec,
+ &mp_vd_lavc_nvdec_copy,
&mp_vd_lavc_cuda,
&mp_vd_lavc_cuda_copy,
#endif
diff --git a/video/hwdec.h b/video/hwdec.h
index 81ba4794b2..2b89c3247c 100644
--- a/video/hwdec.h
+++ b/video/hwdec.h
@@ -26,6 +26,8 @@ enum hwdec_type {
HWDEC_MEDIACODEC_COPY,
HWDEC_CUDA,
HWDEC_CUDA_COPY,
+ HWDEC_NVDEC,
+ HWDEC_NVDEC_COPY,
HWDEC_CRYSTALHD,
HWDEC_RKMPP,
};
diff --git a/video/out/gpu/hwdec.c b/video/out/gpu/hwdec.c
index 9eefe3e287..d88dc5e779 100644
--- a/video/out/gpu/hwdec.c
+++ b/video/out/gpu/hwdec.c
@@ -35,6 +35,7 @@ extern const struct ra_hwdec_driver ra_hwdec_d3d11eglrgb;
extern const struct ra_hwdec_driver ra_hwdec_dxva2gldx;
extern const struct ra_hwdec_driver ra_hwdec_dxva2;
extern const struct ra_hwdec_driver ra_hwdec_cuda;
+extern const struct ra_hwdec_driver ra_hwdec_cuda_nvdec;
extern const struct ra_hwdec_driver ra_hwdec_rpi_overlay;
#if HAVE_DRMPRIME && HAVE_DRM
extern const struct ra_hwdec_driver ra_hwdec_drmprime_drm;
@@ -65,6 +66,7 @@ static const struct ra_hwdec_driver *const mpgl_hwdec_drivers[] = {
#endif
#if HAVE_CUDA_HWACCEL
&ra_hwdec_cuda,
+ &ra_hwdec_cuda_nvdec,
#endif
#if HAVE_RPI
&ra_hwdec_rpi_overlay,
diff --git a/video/out/opengl/hwdec_cuda.c b/video/out/opengl/hwdec_cuda.c
index d9c4c199f1..5aefed106d 100644
--- a/video/out/opengl/hwdec_cuda.c
+++ b/video/out/opengl/hwdec_cuda.c
@@ -160,7 +160,7 @@ static int cuda_init(struct ra_hwdec *hw)
goto error;
p->hwctx = (struct mp_hwdec_ctx) {
- .type = HWDEC_CUDA,
+ .type = hw->driver->api,
.ctx = p->decode_ctx,
.av_device_ref = hw_device_ctx,
};
@@ -340,3 +340,19 @@ const struct ra_hwdec_driver ra_hwdec_cuda = {
.unmap = mapper_unmap,
},
};
+
+const struct ra_hwdec_driver ra_hwdec_cuda_nvdec = {
+ .name = "cuda-nvdec",
+ .api = HWDEC_NVDEC,
+ .imgfmts = {IMGFMT_CUDA, 0},
+ .priv_size = sizeof(struct priv_owner),
+ .init = cuda_init,
+ .uninit = cuda_uninit,
+ .mapper = &(const struct ra_hwdec_mapper_driver){
+ .priv_size = sizeof(struct priv),
+ .init = mapper_init,
+ .uninit = mapper_uninit,
+ .map = mapper_map,
+ .unmap = mapper_unmap,
+ },
+};