summaryrefslogtreecommitdiffstats
path: root/libmpv
diff options
context:
space:
mode:
Diffstat (limited to 'libmpv')
-rw-r--r--libmpv/client.h2
-rw-r--r--libmpv/render.h12
-rw-r--r--libmpv/render_gl.h21
3 files changed, 26 insertions, 9 deletions
diff --git a/libmpv/client.h b/libmpv/client.h
index 44c48402a8..51beb1a41b 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, 102)
+#define MPV_CLIENT_API_VERSION MPV_MAKE_VERSION(1, 103)
/**
* The API user is allowed to "#define MPV_ENABLE_DEPRECATED 0" before
diff --git a/libmpv/render.h b/libmpv/render.h
index 253b2b43f9..304a21a932 100644
--- a/libmpv/render.h
+++ b/libmpv/render.h
@@ -283,14 +283,20 @@ typedef enum mpv_render_param_type {
*/
MPV_RENDER_PARAM_DRM_DISPLAY = 14,
/**
- * DRM osd size, contains osd dimensions.
+ * DRM draw surface size, contains draw surface dimensions.
* Valid for mpv_render_context_create().
- * Type : struct mpv_opengl_drm_osd_size*
+ * Type : struct mpv_opengl_drm_draw_surface_size*
*/
- MPV_RENDER_PARAM_DRM_OSD_SIZE = 15,
+ MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE = 15,
} mpv_render_param_type;
/**
+ * For backwards compatibility with the old naming of
+ * MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE
+ */
+#define MPV_RENDER_PARAM_DRM_OSD_SIZE MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE
+
+/**
* Used to pass arbitrary parameters to some mpv_render_* functions. The
* meaning of the data parameter is determined by the type, and each
* MPV_RENDER_PARAM_* documents what type the value must point to.
diff --git a/libmpv/render_gl.h b/libmpv/render_gl.h
index 44c445e427..69bec75c47 100644
--- a/libmpv/render_gl.h
+++ b/libmpv/render_gl.h
@@ -154,7 +154,7 @@ typedef struct mpv_opengl_fbo {
*/
typedef struct mpv_opengl_drm_params {
/**
- * DRM fd (int). set this to -1 if invalid.
+ * DRM fd (int). Set to a negative number if invalid.
*/
int fd;
@@ -174,17 +174,28 @@ typedef struct mpv_opengl_drm_params {
* The atomic request pointer is usually changed at every renderloop.
*/
struct _drmModeAtomicReq **atomic_request_ptr;
+
+ /**
+ * DRM render node. Used for VAAPI interop.
+ * Set to a negative number if invalid.
+ */
+ int render_fd;
} mpv_opengl_drm_params;
/**
- * For MPV_RENDER_PARAM_DRM_OSD_SIZE.
+ * For MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE.
*/
-typedef struct mpv_opengl_drm_osd_size {
+typedef struct mpv_opengl_drm_draw_surface_size {
/**
- * size of the OSD in pixels.
+ * size of the draw plane surface in pixels.
*/
int width, height;
-} mpv_opengl_drm_osd_size;
+} mpv_opengl_drm_draw_surface_size;
+
+/**
+ * For backwards compatibility with the old naming of mpv_opengl_drm_draw_surface_size
+ */
+#define mpv_opengl_drm_osd_size mpv_opengl_drm_draw_surface_size
#ifdef __cplusplus
}