mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-08 00:18:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: don't compare templ instance pointers

Browse source 
One can pass the PadTemplate from the element_class or the one from the factory.
While they have the same content, the addresses are different.
This commit is contained in:
Stefan Sauer 2015-11-03 19:09:33 -08:00
parent 0b9aea86f8
commit c1fa51953c
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/base/gstaggregator.c
View file

@ -1312,13 +1312,14 @@ gst_aggregator_default_create_new_pad (GstAggregator * self,
GstPadTemplate * templ, const gchar * req_name, const GstCaps * caps) GstPadTemplate * templ, const gchar * req_name, const GstCaps * caps)
{ {
GstAggregatorPad *agg_pad; GstAggregatorPad *agg_pad;
GstElementClass *klass = GST_ELEMENT_GET_CLASS (self);
GstAggregatorPrivate *priv = self->priv; GstAggregatorPrivate *priv = self->priv;
if (templ == gst_element_class_get_pad_template (klass, "sink_%u")) {
gint serial = 0; gint serial = 0;
gchar *name = NULL; gchar *name = NULL;
if (templ->direction != GST_PAD_SINK ||
g_strcmp0 (templ->name_template, "sink_%u"))
goto not_sink;
GST_OBJECT_LOCK (self); GST_OBJECT_LOCK (self);
if (req_name == NULL || strlen (req_name) < 6 if (req_name == NULL || strlen (req_name) < 6
|| !g_str_has_prefix (req_name, "sink_")) { || !g_str_has_prefix (req_name, "sink_")) {
@ -1339,7 +1340,11 @@ gst_aggregator_default_create_new_pad (GstAggregator * self,
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
return agg_pad; return agg_pad;
} else {
/* errors */
not_sink:
{
GST_WARNING_OBJECT (self, "request new pad that is not a SINK pad\n");
return NULL; return NULL;
} }
} }