kmssink: Add 'plane-properties' property

This is similar to 'connector-properties' but will change
selected plane properties instead.

https://bugzilla.gnome.org/show_bug.cgi?id=797027
This commit is contained in:
Nicolas Dufresne 2018-08-27 15:08:08 -04:00
parent 203b41b510
commit 63dca26fac
2 changed files with 44 additions and 1 deletions

View file

@ -89,7 +89,8 @@ enum
PROP_DISPLAY_WIDTH, PROP_DISPLAY_WIDTH,
PROP_DISPLAY_HEIGHT, PROP_DISPLAY_HEIGHT,
PROP_CONNECTOR_PROPS, PROP_CONNECTOR_PROPS,
PROP_N PROP_PLANE_PROPS,
PROP_N,
}; };
static GParamSpec *g_properties[PROP_N] = { NULL, }; static GParamSpec *g_properties[PROP_N] = { NULL, };
@ -659,7 +660,20 @@ gst_kms_sink_update_connector_properties (GstKMSSink * self)
gst_kms_sink_update_properties (&iter, self->connector_props); gst_kms_sink_update_properties (&iter, self->connector_props);
} }
static void
gst_kms_sink_update_plane_properties (GstKMSSink * self)
{
SetPropsIter iter;
if (!self->plane_props)
return;
iter.self = self;
iter.obj_id = self->plane_id;
iter.obj_type = DRM_MODE_OBJECT_PLANE;
iter.obj_type_str = "plane";
gst_kms_sink_update_properties (&iter, self->plane_props);
} }
static gboolean static gboolean
@ -771,6 +785,7 @@ retry_find_plane:
g_object_notify_by_pspec (G_OBJECT (self), g_properties[PROP_DISPLAY_HEIGHT]); g_object_notify_by_pspec (G_OBJECT (self), g_properties[PROP_DISPLAY_HEIGHT]);
gst_kms_sink_update_connector_properties (self); gst_kms_sink_update_connector_properties (self);
gst_kms_sink_update_plane_properties (self);
ret = TRUE; ret = TRUE;
@ -1710,6 +1725,16 @@ gst_kms_sink_set_property (GObject * object, guint prop_id,
break; break;
} }
case PROP_PLANE_PROPS:{
const GstStructure *s = gst_value_get_structure (value);
g_clear_pointer (&sink->plane_props, gst_structure_free);
if (s)
sink->plane_props = gst_structure_copy (s);
break;
}
default: default:
if (!gst_video_overlay_set_property (object, PROP_N, prop_id, value)) if (!gst_video_overlay_set_property (object, PROP_N, prop_id, value))
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -1757,6 +1782,9 @@ gst_kms_sink_get_property (GObject * object, guint prop_id,
case PROP_CONNECTOR_PROPS: case PROP_CONNECTOR_PROPS:
gst_value_set_structure (value, sink->connector_props); gst_value_set_structure (value, sink->connector_props);
break; break;
case PROP_PLANE_PROPS:
gst_value_set_structure (value, sink->plane_props);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -1773,6 +1801,7 @@ gst_kms_sink_finalize (GObject * object)
g_clear_pointer (&sink->bus_id, g_free); g_clear_pointer (&sink->bus_id, g_free);
gst_poll_free (sink->poll); gst_poll_free (sink->poll);
g_clear_pointer (&sink->connector_props, gst_structure_free); g_clear_pointer (&sink->connector_props, gst_structure_free);
g_clear_pointer (&sink->plane_props, gst_structure_free);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -1927,6 +1956,19 @@ gst_kms_sink_class_init (GstKMSSinkClass * klass)
"Additionnal properties for the connector", "Additionnal properties for the connector",
GST_TYPE_STRUCTURE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); GST_TYPE_STRUCTURE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
* kmssink:plane-properties:
*
* Additional properties for the plane. Keys are strings and values
* unsigned 64 bits integers.
*
* Since: 1.16
*/
g_properties[PROP_PLANE_PROPS] =
g_param_spec_boxed ("plane-properties", "Connector Plane",
"Additionnal properties for the plane",
GST_TYPE_STRUCTURE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (gobject_class, PROP_N, g_properties); g_object_class_install_properties (gobject_class, PROP_N, g_properties);
gst_video_overlay_install_properties (gobject_class, PROP_N); gst_video_overlay_install_properties (gobject_class, PROP_N);

View file

@ -66,6 +66,7 @@ struct _GstKMSSink {
gboolean modesetting_enabled; gboolean modesetting_enabled;
GstStructure *connector_props; GstStructure *connector_props;
GstStructure *plane_props;
GstVideoInfo vinfo; GstVideoInfo vinfo;
GstCaps *allowed_caps; GstCaps *allowed_caps;