mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 22:06:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/gbm: Add GST_GL_GBM_DRM_CONNECTOR environment variable

Browse source 
If multiple DRM connectors are connected, currently the first one is
picked. Improve this by adding an environment variable that allows for
choosing a connector by name. The connector name has been made so they
are compatible with modetest/modeprint DRM utilities.

Related to #490
This commit is contained in:
Carlos Rafael Giani 2018-10-04 00:27:42 +02:00 committed by Nicolas Dufresne
parent 3663ad787d
commit 08ea7d676e
1 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gst-libs/gst/gl/gbm/gstgldisplay_gbm.c
View file

@ -49,7 +49,8 @@ static guint32 gst_gl_gbm_find_crtc_id_for_encoder (GstGLDisplayGBM *
static guint32 gst_gl_gbm_find_crtc_id_for_connector (GstGLDisplayGBM * static guint32 gst_gl_gbm_find_crtc_id_for_connector (GstGLDisplayGBM *
display_gbm); display_gbm);
static gboolean gst_gl_display_gbm_setup_drm (GstGLDisplayGBM * display_gbm); static gboolean gst_gl_display_gbm_setup_drm (GstGLDisplayGBM * display_gbm,
const gchar * drm_connector_name);
static void gst_gl_display_gbm_shutdown_drm (GstGLDisplayGBM * display_gbm); static void gst_gl_display_gbm_shutdown_drm (GstGLDisplayGBM * display_gbm);
static gboolean gst_gl_display_gbm_setup_gbm (GstGLDisplayGBM * display_gbm); static gboolean gst_gl_display_gbm_setup_gbm (GstGLDisplayGBM * display_gbm);
@ -140,7 +141,8 @@ gst_gl_gbm_find_crtc_id_for_connector (GstGLDisplayGBM * display_gbm)
static gboolean static gboolean
gst_gl_display_gbm_setup_drm (GstGLDisplayGBM * display_gbm) gst_gl_display_gbm_setup_drm (GstGLDisplayGBM * display_gbm, const gchar *
drm_connector_name)
{ {
int i; int i;
@ -168,8 +170,12 @@ gst_gl_display_gbm_setup_drm (GstGLDisplayGBM * display_gbm)
drmModeConnector *candidate_connector = drmModeConnector *candidate_connector =
drmModeGetConnector (display_gbm->drm_fd, drmModeGetConnector (display_gbm->drm_fd,
display_gbm->drm_mode_resources->connectors[i]); display_gbm->drm_mode_resources->connectors[i]);
const gchar *candidate_name = gchar *candidate_name;
gst_gl_gbm_get_name_for_drm_connector (candidate_connector);
candidate_name = g_strdup_printf ("%s-%i",
gst_gl_gbm_get_name_for_drm_connector (candidate_connector),
candidate_connector->connector_type_id);
GST_DEBUG ("Found DRM connector #%d \"%s\" with ID %" G_GUINT32_FORMAT, i, GST_DEBUG ("Found DRM connector #%d \"%s\" with ID %" G_GUINT32_FORMAT, i,
candidate_name, candidate_connector->connector_id); candidate_name, candidate_connector->connector_id);
@ -179,14 +185,34 @@ gst_gl_display_gbm_setup_drm (GstGLDisplayGBM * display_gbm)
* connector. Just loop instead. */ * connector. Just loop instead. */
if (connected_connector != NULL) { if (connected_connector != NULL) {
drmModeFreeConnector (candidate_connector); drmModeFreeConnector (candidate_connector);
g_free (candidate_name);
continue; continue;
} }
if (drm_connector_name != NULL) {
if (g_ascii_strcasecmp (drm_connector_name, candidate_name) != 0) {
drmModeFreeConnector (candidate_connector);
g_free (candidate_name);
continue;
}
}
if (candidate_connector->connection == DRM_MODE_CONNECTED) { if (candidate_connector->connection == DRM_MODE_CONNECTED) {
GST_DEBUG ("Picking DRM connector #%d because it is connected", i); if (drm_connector_name != NULL)
GST_DEBUG ("Picking DRM connector #%d because it is connected and "
"has a matching name \"%s\"", i, candidate_name);
else
GST_DEBUG ("Picking DRM connector #%d because it is connected", i);
connected_connector = candidate_connector; connected_connector = candidate_connector;
} else g_free (candidate_name);
break;
} else {
if (drm_connector_name != NULL)
GST_WARNING ("DRM connector #%d has a matching name \"%s\" but is "
"not connected; not picking it", i, candidate_name);
drmModeFreeConnector (candidate_connector); drmModeFreeConnector (candidate_connector);
g_free (candidate_name);
}
} }
if (connected_connector == NULL) { if (connected_connector == NULL) {
@ -389,10 +415,12 @@ gst_gl_display_gbm_new (void)
int drm_fd = -1; int drm_fd = -1;
GstGLDisplayGBM *display; GstGLDisplayGBM *display;
const gchar *drm_node_name; const gchar *drm_node_name;
const gchar *drm_connector_name;
_init_debug (); _init_debug ();
drm_node_name = g_getenv ("GST_GL_GBM_DRM_DEVICE"); drm_node_name = g_getenv ("GST_GL_GBM_DRM_DEVICE");
drm_connector_name = g_getenv ("GST_GL_GBM_DRM_CONNECTOR");
if (drm_node_name != NULL) { if (drm_node_name != NULL) {
GST_DEBUG ("attempting to open device %s (specified by the " GST_DEBUG ("attempting to open device %s (specified by the "
@ -416,7 +444,12 @@ gst_gl_display_gbm_new (void)
display = g_object_new (GST_TYPE_GL_DISPLAY_GBM, NULL); display = g_object_new (GST_TYPE_GL_DISPLAY_GBM, NULL);
display->drm_fd = drm_fd; display->drm_fd = drm_fd;
if (!gst_gl_display_gbm_setup_drm (display)) { if (drm_connector_name != NULL) {
GST_DEBUG ("GST_GL_GBM_DRM_CONNECTOR variable set to value \"%s\"; "
"will use this name to match connector(s) against", drm_connector_name);
}
if (!gst_gl_display_gbm_setup_drm (display, drm_connector_name)) {
GST_WARNING ("Failed to initialize DRM"); GST_WARNING ("Failed to initialize DRM");
} }