summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
Diffstat (limited to 'video/out')
-rw-r--r--video/out/drm_atomic.c32
-rw-r--r--video/out/drm_atomic.h5
-rw-r--r--video/out/drm_common.c13
3 files changed, 32 insertions, 18 deletions
diff --git a/video/out/drm_atomic.c b/video/out/drm_atomic.c
index f530d91b66..fea8ffa88e 100644
--- a/video/out/drm_atomic.c
+++ b/video/out/drm_atomic.c
@@ -138,7 +138,8 @@ 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_id, int video_plane_id)
+ int connector_id,
+ int osd_plane_idx, int video_plane_idx)
{
drmModePlaneRes *plane_res = NULL;
drmModeRes *res = NULL;
@@ -228,12 +229,12 @@ struct drm_atomic_context *drm_atomic_create_context(struct mp_log *log, int fd,
if ((!overlay_id) && (value == DRM_PLANE_TYPE_OVERLAY))
overlay_id = plane_id;
- if (layercount == osd_plane_id) {
+ if (layercount == osd_plane_idx) {
ctx->osd_plane = plane;
continue;
}
- if (layercount == video_plane_id) {
+ if (layercount == video_plane_idx) {
ctx->video_plane = plane;
continue;
}
@@ -244,26 +245,31 @@ struct drm_atomic_context *drm_atomic_create_context(struct mp_log *log, int fd,
}
}
- // default OSD plane to primary if unspecified
+ // OSD plane was specified as either of the special options: any primary plane or any overlay plane
if (!ctx->osd_plane) {
- if (primary_id) {
- mp_verbose(log, "Using default plane %d for OSD\n", primary_id);
- ctx->osd_plane = drm_object_create(log, ctx->fd, primary_id, DRM_MODE_OBJECT_PLANE);
+ const int osd_plane_id = (osd_plane_idx == DRM_OPTS_OVERLAY_PLANE) ? overlay_id : primary_id;
+ const char *plane_type = (osd_plane_idx == DRM_OPTS_OVERLAY_PLANE) ? "overlay" : "primary";
+ if (osd_plane_id) {
+ mp_verbose(log, "Using %s plane %d for OSD\n", plane_type, osd_plane_id);
+ ctx->osd_plane = drm_object_create(log, ctx->fd, osd_plane_id, DRM_MODE_OBJECT_PLANE);
} else {
- mp_err(log, "Failed to find OSD plane with id=%d\n", osd_plane_id);
+ mp_err(log, "Failed to find OSD plane with idx=%d\n", osd_plane_idx);
goto fail;
}
} else {
mp_verbose(log, "Found OSD plane with ID %d\n", ctx->osd_plane->id);
}
- // default video plane to overlay if unspecified
+ // video plane was specified as either of the special options: any primary plane or any overlay plane
if (!ctx->video_plane) {
- if (overlay_id) {
- mp_verbose(log, "Using default plane %d for video\n", overlay_id);
- ctx->video_plane = drm_object_create(log, ctx->fd, overlay_id, DRM_MODE_OBJECT_PLANE);
+ const int video_plane_id = (video_plane_idx == DRM_OPTS_PRIMARY_PLANE) ? primary_id : overlay_id;
+ const char *plane_type = (video_plane_idx == DRM_OPTS_PRIMARY_PLANE) ? "primary" : "overlay";
+
+ if (video_plane_id) {
+ mp_verbose(log, "Using %s plane %d for video\n", plane_type, video_plane_id);
+ ctx->video_plane = drm_object_create(log, ctx->fd, video_plane_id, DRM_MODE_OBJECT_PLANE);
} else {
- mp_verbose(log, "Failed to find video plane with id=%d. drmprime-drm hwdec interop will not work\n", video_plane_id);
+ mp_verbose(log, "Failed to find video plane with idx=%d. drmprime-drm hwdec interop will not work\n", video_plane_idx);
}
} else {
mp_verbose(log, "Found video plane with ID %d\n", ctx->video_plane->id);
diff --git a/video/out/drm_atomic.h b/video/out/drm_atomic.h
index cd0252a767..bfbec2bde2 100644
--- a/video/out/drm_atomic.h
+++ b/video/out/drm_atomic.h
@@ -25,6 +25,9 @@
#include "common/msg.h"
+#define DRM_OPTS_PRIMARY_PLANE -1
+#define DRM_OPTS_OVERLAY_PLANE -2
+
struct drm_mode {
drmModeModeInfo mode;
uint32_t blob_id;
@@ -89,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_id, int video_plane_id);
+ int osd_plane_idx, int video_plane_idx);
void drm_atomic_destroy_context(struct drm_atomic_context *ctx);
bool drm_atomic_save_old_state(struct drm_atomic_context *ctx);
diff --git a/video/out/drm_common.c b/video/out/drm_common.c
index aa3d0998c4..647d545eb9 100644
--- a/video/out/drm_common.c
+++ b/video/out/drm_common.c
@@ -23,6 +23,7 @@
#include <sys/stat.h>
#include <sys/vt.h>
#include <unistd.h>
+#include <limits.h>
#include "drm_common.h"
@@ -47,8 +48,12 @@ const struct m_sub_options drm_conf = {
OPT_STRING_VALIDATE("drm-connector", drm_connector_spec,
0, drm_validate_connector_opt),
OPT_INT("drm-mode", drm_mode_id, 0),
- OPT_INT("drm-osd-plane-id", drm_osd_plane_id, 0),
- OPT_INT("drm-video-plane-id", drm_video_plane_id, 0),
+ OPT_CHOICE_OR_INT("drm-osd-plane-id", drm_osd_plane_id, 0, 0, INT_MAX,
+ ({"primary", DRM_OPTS_PRIMARY_PLANE},
+ {"overlay", DRM_OPTS_OVERLAY_PLANE})),
+ OPT_CHOICE_OR_INT("drm-video-plane-id", drm_video_plane_id, 0, 0, INT_MAX,
+ ({"primary", DRM_OPTS_PRIMARY_PLANE},
+ {"overlay", DRM_OPTS_OVERLAY_PLANE})),
OPT_CHOICE("drm-format", drm_format, 0,
({"xrgb8888", DRM_OPTS_FORMAT_XRGB8888},
{"xrgb2101010", DRM_OPTS_FORMAT_XRGB2101010})),
@@ -56,8 +61,8 @@ const struct m_sub_options drm_conf = {
{0},
},
.defaults = &(const struct drm_opts) {
- .drm_osd_plane_id = -1,
- .drm_video_plane_id = -1,
+ .drm_osd_plane_id = DRM_OPTS_PRIMARY_PLANE,
+ .drm_video_plane_id = DRM_OPTS_OVERLAY_PLANE,
},
.size = sizeof(struct drm_opts),
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 21:29:32 +0000