mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
smart-mixer: Add support for d3d11compositor and glvideomixer
Some hardware compositor elements (d3d11compositor and glvideomixer) consist of wrapper bin with internal mixer element. So, we need special handling for such elements. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/242>
This commit is contained in:
parent
eaaaf78090
commit
bf5741f424
2 changed files with 55 additions and 6 deletions
|
@ -402,16 +402,25 @@ ges_smart_mixer_constructed (GObject * obj)
|
||||||
{
|
{
|
||||||
GstPad *pad;
|
GstPad *pad;
|
||||||
GstElement *identity, *videoconvert;
|
GstElement *identity, *videoconvert;
|
||||||
|
|
||||||
GESSmartMixer *self = GES_SMART_MIXER (obj);
|
GESSmartMixer *self = GES_SMART_MIXER (obj);
|
||||||
gchar *cname = g_strdup_printf ("%s-compositor", GST_OBJECT_NAME (self));
|
gchar *cname = g_strdup_printf ("%s-compositor", GST_OBJECT_NAME (self));
|
||||||
|
GstElement *mixer;
|
||||||
|
|
||||||
self->mixer =
|
self->mixer =
|
||||||
gst_element_factory_create (ges_get_compositor_factory (), cname);
|
gst_element_factory_create (ges_get_compositor_factory (), cname);
|
||||||
g_free (cname);
|
g_free (cname);
|
||||||
g_object_set (self->mixer, "background", 1, "emit-signals", TRUE, NULL);
|
|
||||||
g_signal_connect (self->mixer, "samples-selected",
|
if (GST_IS_BIN (self->mixer)) {
|
||||||
|
g_object_get (self->mixer, "mixer", &mixer, NULL);
|
||||||
|
g_assert (mixer);
|
||||||
|
} else {
|
||||||
|
mixer = gst_object_ref (self->mixer);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_object_set (mixer, "background", 1, "emit-signals", TRUE, NULL);
|
||||||
|
g_signal_connect (mixer, "samples-selected",
|
||||||
G_CALLBACK (ges_smart_mixer_samples_selected_cb), self);
|
G_CALLBACK (ges_smart_mixer_samples_selected_cb), self);
|
||||||
|
gst_object_unref (mixer);
|
||||||
|
|
||||||
/* See https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/310 */
|
/* See https://gitlab.freedesktop.org/gstreamer/gstreamer/issues/310 */
|
||||||
GST_FIXME ("Stop dropping allocation query when it is not required anymore.");
|
GST_FIXME ("Stop dropping allocation query when it is not required anymore.");
|
||||||
|
|
|
@ -137,6 +137,7 @@ find_compositor (GstPluginFeature * feature, gpointer udata)
|
||||||
gboolean res = FALSE;
|
gboolean res = FALSE;
|
||||||
const gchar *klass;
|
const gchar *klass;
|
||||||
GstPluginFeature *loaded_feature = NULL;
|
GstPluginFeature *loaded_feature = NULL;
|
||||||
|
GstElement *elem = NULL;
|
||||||
|
|
||||||
if (G_UNLIKELY (!GST_IS_ELEMENT_FACTORY (feature)))
|
if (G_UNLIKELY (!GST_IS_ELEMENT_FACTORY (feature)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -153,9 +154,48 @@ find_compositor (GstPluginFeature * feature, gpointer udata)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
res =
|
/* Some hardware compositor elements (d3d11compositor for example) consist of
|
||||||
g_type_is_a (gst_element_factory_get_element_type (GST_ELEMENT_FACTORY
|
* bin with internal mixer elements */
|
||||||
(loaded_feature)), GST_TYPE_AGGREGATOR);
|
if (g_type_is_a (gst_element_factory_get_element_type (GST_ELEMENT_FACTORY
|
||||||
|
(loaded_feature)), GST_TYPE_BIN)) {
|
||||||
|
GParamSpec *pspec;
|
||||||
|
GstElement *mixer = NULL;
|
||||||
|
|
||||||
|
elem =
|
||||||
|
gst_element_factory_create (GST_ELEMENT_FACTORY_CAST (loaded_feature),
|
||||||
|
NULL);
|
||||||
|
|
||||||
|
/* Checks whether this element has mixer property and the internal element
|
||||||
|
* is aggregator subclass */
|
||||||
|
if (!elem) {
|
||||||
|
GST_ERROR ("Could not create element from factory %" GST_PTR_FORMAT,
|
||||||
|
feature);
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (elem), "mixer");
|
||||||
|
if (!pspec)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
if (!g_type_is_a (pspec->value_type, GST_TYPE_ELEMENT))
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
g_object_get (elem, "mixer", &mixer, NULL);
|
||||||
|
if (!mixer)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
if (GST_IS_AGGREGATOR (mixer))
|
||||||
|
res = TRUE;
|
||||||
|
|
||||||
|
gst_object_unref (mixer);
|
||||||
|
} else {
|
||||||
|
res =
|
||||||
|
g_type_is_a (gst_element_factory_get_element_type (GST_ELEMENT_FACTORY
|
||||||
|
(loaded_feature)), GST_TYPE_AGGREGATOR);
|
||||||
|
}
|
||||||
|
|
||||||
|
done:
|
||||||
|
gst_clear_object (&elem);
|
||||||
gst_object_unref (loaded_feature);
|
gst_object_unref (loaded_feature);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue