diff options
| author | LongChair <longchair@hotmail.com> | 2018-04-29 17:46:23 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-05-01 20:48:02 +0300 |
| commit | ed94f8dc00dd75bf5d88bdf73b9d69a579c0f8ef (patch) | |
| tree | a7464c8db4f154423ee148c2c6e08f047b41a762 /video/out/drm_atomic.h | |
| parent | 49bc07faea5f3c621eed437fadf68653b4b2498b (diff) | |
| download | mpv-ed94f8dc00dd75bf5d88bdf73b9d69a579c0f8ef.tar.bz2 mpv-ed94f8dc00dd75bf5d88bdf73b9d69a579c0f8ef.tar.xz | |
drm/atomic: refactor planes names
We are currently using primary / overlay planes drm objects, assuming that primary plane is osd and overlay plane is video.
This commit is doing two things :
- replace the primary / overlay planes members with osd and video planes member without the assumption
- Add two more options to determine which one of the primary / overlay is associated to osd / video.
- It will default osd to overlay and video to primary if unspecified
Diffstat (limited to 'video/out/drm_atomic.h')
| -rw-r--r-- | video/out/drm_atomic.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/video/out/drm_atomic.h b/video/out/drm_atomic.h index d4d5707274..01246baf36 100644 --- a/video/out/drm_atomic.h +++ b/video/out/drm_atomic.h @@ -37,8 +37,8 @@ struct drm_atomic_context { struct drm_object *crtc; struct drm_object *connector; - struct drm_object *primary_plane; - struct drm_object *overlay_plane; + struct drm_object *osd_plane; + struct drm_object *video_plane; drmModeAtomicReq *request; }; @@ -52,7 +52,8 @@ drmModePropertyBlobPtr drm_object_get_property_blob(struct drm_object *object, c struct drm_object * drm_object_create(struct mp_log *log, int fd, uint32_t object_id, uint32_t type); 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 overlay_id); +struct drm_atomic_context *drm_atomic_create_context(struct mp_log *log, int fd, int crtc_id, int connector_id, + int osd_plane_id, int video_plane_id); void drm_atomic_destroy_context(struct drm_atomic_context *ctx); #endif // MP_DRMATOMIC_H |