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_atomic.h | |
| parent | c151fae054d12ef9b392f5b6dcc1bafe894005b0 (diff) | |
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_atomic.h')
| -rw-r--r-- | video/out/drm_atomic.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/video/out/drm_atomic.h b/video/out/drm_atomic.h index bfbec2bde2..5b2dc5976d 100644 --- a/video/out/drm_atomic.h +++ b/video/out/drm_atomic.h @@ -57,8 +57,8 @@ struct drm_atomic_state { struct drm_mode mode; uint64_t active; } crtc; - struct drm_atomic_plane_state osd_plane; - struct drm_atomic_plane_state video_plane; + struct drm_atomic_plane_state draw_plane; + struct drm_atomic_plane_state drmprime_video_plane; }; struct drm_object { @@ -74,8 +74,8 @@ struct drm_atomic_context { struct drm_object *crtc; struct drm_object *connector; - struct drm_object *osd_plane; - struct drm_object *video_plane; + struct drm_object *draw_plane; + struct drm_object *drmprime_video_plane; drmModeAtomicReq *request; @@ -92,7 +92,7 @@ struct drm_object * drm_object_create(struct mp_log *log, int fd, uint32_t objec void drm_object_free(struct drm_object *object); void drm_object_print_info(struct mp_log *log, struct drm_object *object); struct drm_atomic_context *drm_atomic_create_context(struct mp_log *log, int fd, int crtc_id, int connector_id, - int osd_plane_idx, int video_plane_idx); + int draw_plane_idx, int drmprime_video_plane_idx); void drm_atomic_destroy_context(struct drm_atomic_context *ctx); bool drm_atomic_save_old_state(struct drm_atomic_context *ctx); |