diff options
Diffstat (limited to 'libmpv')
-rw-r--r-- | libmpv/client.h | 2 | ||||
-rw-r--r-- | libmpv/render.h | 9 | ||||
-rw-r--r-- | libmpv/render_gl.h | 38 |
3 files changed, 33 insertions, 16 deletions
diff --git a/libmpv/client.h b/libmpv/client.h index 51beb1a41b..eec3d0776f 100644 --- a/libmpv/client.h +++ b/libmpv/client.h @@ -223,7 +223,7 @@ extern "C" { * relational operators (<, >, <=, >=). */ #define MPV_MAKE_VERSION(major, minor) (((major) << 16) | (minor) | 0UL) -#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 103) +#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 104) /** * The API user is allowed to "#define MPV_ENABLE_DEPRECATED 0" before diff --git a/libmpv/render.h b/libmpv/render.h index 304a21a932..14933674ca 100644 --- a/libmpv/render.h +++ b/libmpv/render.h @@ -277,8 +277,7 @@ typedef enum mpv_render_param_type { */ MPV_RENDER_PARAM_SKIP_RENDERING = 13, /** - * DRM display, contains drm display handles. - * Valid for mpv_render_context_create(). + * Deprecated. Not supported. Use MPV_RENDER_PARAM_DRM_DISPLAY_V2 instead. * Type : struct mpv_opengl_drm_params* */ MPV_RENDER_PARAM_DRM_DISPLAY = 14, @@ -288,6 +287,12 @@ typedef enum mpv_render_param_type { * Type : struct mpv_opengl_drm_draw_surface_size* */ MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE = 15, + /** + * DRM display, contains drm display handles. + * Valid for mpv_render_context_create(). + * Type : struct mpv_opengl_drm_params_v2* + */ + MPV_RENDER_PARAM_DRM_DISPLAY_V2 = 16, } mpv_render_param_type; /** diff --git a/libmpv/render_gl.h b/libmpv/render_gl.h index 69bec75c47..cb141df564 100644 --- a/libmpv/render_gl.h +++ b/libmpv/render_gl.h @@ -150,11 +150,32 @@ typedef struct mpv_opengl_fbo { } mpv_opengl_fbo; /** - * For MPV_RENDER_PARAM_DRM_DISPLAY. + * Deprecated. For MPV_RENDER_PARAM_DRM_DISPLAY. */ typedef struct mpv_opengl_drm_params { + int fd; + int crtc_id; + int connector_id; + struct _drmModeAtomicReq **atomic_request_ptr; + int render_fd; +} mpv_opengl_drm_params; + +/** + * For MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE. + */ +typedef struct mpv_opengl_drm_draw_surface_size { /** - * DRM fd (int). Set to a negative number if invalid. + * size of the draw plane surface in pixels. + */ + int width, height; +} mpv_opengl_drm_draw_surface_size; + +/** + * For MPV_RENDER_PARAM_DRM_DISPLAY_V2. + */ +typedef struct mpv_opengl_drm_params_v2 { + /** + * DRM fd (int). Set to -1 if invalid. */ int fd; @@ -177,20 +198,11 @@ typedef struct mpv_opengl_drm_params { /** * DRM render node. Used for VAAPI interop. - * Set to a negative number if invalid. + * Set to -1 if invalid. */ int render_fd; -} mpv_opengl_drm_params; +} mpv_opengl_drm_params_v2; -/** - * For MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE. - */ -typedef struct mpv_opengl_drm_draw_surface_size { - /** - * size of the draw plane surface in pixels. - */ - int width, height; -} mpv_opengl_drm_draw_surface_size; /** * For backwards compatibility with the old naming of mpv_opengl_drm_draw_surface_size |