From bdbb3142ec4046f35265b8ca19c701b9b2f4fefa Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 26 Jan 2017 11:32:09 +0100 Subject: client API: adjust opengl_cb hardware decoding comments Replace the reprecated --hwdec-preload option. Add a comment about cuvid/cuda decoding. --- libmpv/opengl_cb.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libmpv/opengl_cb.h b/libmpv/opengl_cb.h index 6500b4ef65..0c14f0f2de 100644 --- a/libmpv/opengl_cb.h +++ b/libmpv/opengl_cb.h @@ -117,14 +117,17 @@ extern "C" { * * While "normal" mpv loads the OpenGL hardware decoding interop on demand, * this can't be done with opengl_cb for internal technical reasons. Instead, - * make it load the interop at load time by setting the "hwdec-preload"="auto" - * option before calling mpv_opengl_cb_init_gl(). + * make it load the interop at load time by setting the + * "opengl-hwdec-interop"="auto" option before calling mpv_opengl_cb_init_gl() + * ("hwdec-preload" in older mpv releases). * * There may be certain requirements on the OpenGL implementation: * - Windows: ANGLE is required (although in theory GL/DX interop could be used) * - Intel/Linux: EGL is required, and also a glMPGetNativeDisplay() callback * must be provided (see sections below) - * - nVidia/Linux: GLX is required + * - nVidia/Linux: GLX is required (if you force "cuda", it should work on EGL + * as well, if you have recent enough drivers and the + * "hwaccel" option is set to "cuda" as well) * - OSX: CGL is required (CGLGetCurrentContext() returning non-NULL) * * Once these things are setup, hardware decoding can be enabled/disabled at -- cgit v1.2.3