diff options
| author | Anton Kindestam <antonki@kth.se> | 2018-12-01 12:01:17 +0100 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-12-01 15:42:20 +0200 |
| commit | f0509d3738ec37cfa4afa81f070c8abd876e6561 (patch) | |
| tree | cc2a7c485c01825b01b66e8277d4750bb9f23bf5 /video/out/drm_common.h | |
| parent | c151fae054d12ef9b392f5b6dcc1bafe894005b0 (diff) | |
| download | mpv-f0509d3738ec37cfa4afa81f070c8abd876e6561.tar.bz2 mpv-f0509d3738ec37cfa4afa81f070c8abd876e6561.tar.xz | |
drm: rename plane options to better, invariant, names
This commit bumps the libmpv version to 1.102
drm-osd-plane -> drm-draw-plane
drm-video-plane -> drm-drmprime-video-plane
drm-osd-size -> drm-draw-surface-size
"draw plane", as in the plane that OpenGL draws to, whether it be
video + OSD or just OSD.
"drmprime video plane", as in the plane used for hwdec video imported
via drmprime.
"draw surface size", as in the size of the surface used for the draw plane
The new names are invariant whether or not hwdec_drmprime_drm is being
used or not. The original naming was very confusing, as when doing
regular rendering (swdec or vaapi) the video would be displayed on the
"OSD plane", and the "Video plane" would remain unused.
Diffstat (limited to 'video/out/drm_common.h')
| -rw-r--r-- | video/out/drm_common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/drm_common.h b/video/out/drm_common.h index 3f144102ec..d9f086cd4e 100644 --- a/video/out/drm_common.h +++ b/video/out/drm_common.h @@ -48,10 +48,10 @@ struct vt_switcher { struct drm_opts { char *drm_connector_spec; int drm_mode_id; - int drm_osd_plane_id; - int drm_video_plane_id; + int drm_draw_plane; + int drm_drmprime_video_plane; int drm_format; - struct m_geometry drm_osd_size; + struct m_geometry drm_draw_surface_size; }; bool vt_switcher_init(struct vt_switcher *s, struct mp_log *log); @@ -65,7 +65,7 @@ void vt_switcher_release(struct vt_switcher *s, void (*handler)(void*), void *user_data); struct kms *kms_create(struct mp_log *log, const char *connector_spec, - int mode_id, int osd_plane_id, int video_plane_id); + int mode_id, int draw_plane, int drmprime_video_plane); void kms_destroy(struct kms *kms); double kms_get_display_fps(const struct kms *kms); |