summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
Diffstat (limited to 'video')
-rw-r--r--video/cuda.c47
-rw-r--r--video/hwdec.c3
-rw-r--r--video/hwdec.h1
-rw-r--r--video/out/gpu/hwdec.c2
4 files changed, 52 insertions, 1 deletions
diff --git a/video/cuda.c b/video/cuda.c
new file mode 100644
index 0000000000..2f3f51e061
--- /dev/null
+++ b/video/cuda.c
@@ -0,0 +1,47 @@
+/*
+ * This file is part of mpv.
+ *
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * mpv is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "hwdec.h"
+#include "options/m_config.h"
+
+#include <libavutil/hwcontext.h>
+
+static struct AVBufferRef *cuda_create_standalone(struct mpv_global *global,
+ struct mp_log *log, struct hwcontext_create_dev_params *params)
+{
+ int decode_dev_idx;
+ mp_read_option_raw(global, "cuda-decode-device", &m_option_type_choice,
+ &decode_dev_idx);
+
+ char *decode_dev = NULL;
+ if (decode_dev_idx != -1) {
+ decode_dev = talloc_asprintf(NULL, "%d", decode_dev_idx);
+ }
+
+ AVBufferRef* ref = NULL;
+ av_hwdevice_ctx_create(&ref, AV_HWDEVICE_TYPE_CUDA, decode_dev, NULL, 0);
+
+ ta_free(decode_dev);
+ return ref;
+}
+
+const struct hwcontext_fns hwcontext_fns_cuda = {
+ .av_hwdevice_type = AV_HWDEVICE_TYPE_CUDA,
+ .create_dev = cuda_create_standalone,
+};
diff --git a/video/hwdec.c b/video/hwdec.c
index b3c2131791..97b984db18 100644
--- a/video/hwdec.c
+++ b/video/hwdec.c
@@ -119,6 +119,9 @@ char *hwdec_devices_get_names(struct mp_hwdec_devices *devs)
}
static const struct hwcontext_fns *const hwcontext_fns[] = {
+#if HAVE_CUDA_HWACCEL
+ &hwcontext_fns_cuda,
+#endif
#if HAVE_D3D_HWACCEL
&hwcontext_fns_d3d11,
#endif
diff --git a/video/hwdec.h b/video/hwdec.h
index 0aa33a05ba..b2ca8ca894 100644
--- a/video/hwdec.h
+++ b/video/hwdec.h
@@ -89,6 +89,7 @@ struct hwcontext_fns {
// recursive includes). May return NULL for unknown device types.
const struct hwcontext_fns *hwdec_get_hwcontext_fns(int av_hwdevice_type);
+extern const struct hwcontext_fns hwcontext_fns_cuda;
extern const struct hwcontext_fns hwcontext_fns_d3d11;
extern const struct hwcontext_fns hwcontext_fns_dxva2;
extern const struct hwcontext_fns hwcontext_fns_vaapi;
diff --git a/video/out/gpu/hwdec.c b/video/out/gpu/hwdec.c
index f1c941cdc9..c07dbf9fd0 100644
--- a/video/out/gpu/hwdec.c
+++ b/video/out/gpu/hwdec.c
@@ -64,7 +64,7 @@ const struct ra_hwdec_driver *const ra_hwdec_drivers[] = {
#if HAVE_GL_DXINTEROP_D3D9
&ra_hwdec_dxva2gldx,
#endif
-#if HAVE_CUDA_HWACCEL
+#if HAVE_CUDA_INTEROP
&ra_hwdec_cuda,
#endif
#if HAVE_VDPAU_GL_X11