mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 10:12:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

framepositioner: Install operator property only when compositor is used

Browse source 
Other compositor/mixer elements might not have the property. For instance,
d3d11compositor and glvideomixer define graphics API specific blending
properties, instead of simple "operator" one.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/242>
This commit is contained in:
Seungha Yang 2021-04-24 00:55:45 +09:00
parent 60856d5a6f
commit eaaaf78090
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ges/gstframepositioner.c
View file

@ -93,16 +93,21 @@ gst_compositor_operator_get_type_and_default_value (int *default_operator_value)
GParamSpec *pspec = GParamSpec *pspec =
g_object_class_find_property (G_OBJECT_GET_CLASS (compositorPad), g_object_class_find_property (G_OBJECT_GET_CLASS (compositorPad),
"operator"); "operator");
GType ret = 0;
*default_operator_value = if (pspec) {
g_value_get_enum (g_param_spec_get_default_value (pspec)); *default_operator_value =
g_return_val_if_fail (pspec, G_TYPE_NONE); g_value_get_enum (g_param_spec_get_default_value (pspec));
g_return_val_if_fail (pspec, G_TYPE_NONE);
ret = pspec->value_type;
}
gst_element_release_request_pad (compositor, compositorPad); gst_element_release_request_pad (compositor, compositorPad);
gst_object_unref (compositorPad); gst_object_unref (compositorPad);
gst_object_unref (compositor); gst_object_unref (compositor);
return pspec->value_type; return ret;
} }
static void static void
@ -451,10 +456,11 @@ gst_frame_positioner_dispose (GObject * object)
static void static void
gst_frame_positioner_class_init (GstFramePositionerClass * klass) gst_frame_positioner_class_init (GstFramePositionerClass * klass)
{ {
int default_operator_value; int default_operator_value = 0;
GType operator_gtype = GType operator_gtype =
gst_compositor_operator_get_type_and_default_value gst_compositor_operator_get_type_and_default_value
(&default_operator_value); (&default_operator_value);
guint n_pspecs = PROP_LAST;
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstBaseTransformClass *base_transform_class = GstBaseTransformClass *base_transform_class =
@ -536,13 +542,18 @@ gst_frame_positioner_class_init (GstFramePositionerClass * klass)
* *
* The blending operator for the source. * The blending operator for the source.
*/ */
properties[PROP_OPERATOR] = if (operator_gtype) {
g_param_spec_enum ("operator", "Operator", properties[PROP_OPERATOR] =
"Blending operator to use for blending this pad over the previous ones", g_param_spec_enum ("operator", "Operator",
operator_gtype, default_operator_value, "Blending operator to use for blending this pad over the previous ones",
(G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE | G_PARAM_STATIC_STRINGS)); operator_gtype, default_operator_value,
(G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE |
GST_PARAM_CONDITIONALLY_AVAILABLE | G_PARAM_STATIC_STRINGS));
} else {
n_pspecs--;
}
g_object_class_install_properties (gobject_class, PROP_LAST, properties); g_object_class_install_properties (gobject_class, n_pspecs, properties);
gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass), gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass),
"frame positioner", "Metadata", "frame positioner", "Metadata",
@ -708,7 +719,7 @@ static gboolean
gst_frame_positioner_meta_init (GstMeta * meta, gpointer params, gst_frame_positioner_meta_init (GstMeta * meta, gpointer params,
GstBuffer * buffer) GstBuffer * buffer)
{ {
int default_operator_value; int default_operator_value = 0;
GstFramePositionerMeta *smeta; GstFramePositionerMeta *smeta;
smeta = (GstFramePositionerMeta *) meta; smeta = (GstFramePositionerMeta *) meta;