mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 13:18:52 +00:00
videomixer: change sink pad template name from sink_%d to sink_%u
This commit is contained in:
parent
01db5dbff0
commit
2d249dcc29
2 changed files with 5 additions and 5 deletions
|
@ -112,7 +112,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
|
||||||
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (FORMATS))
|
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (FORMATS))
|
||||||
);
|
);
|
||||||
|
|
||||||
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink_%d",
|
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink_%u",
|
||||||
GST_PAD_SINK,
|
GST_PAD_SINK,
|
||||||
GST_PAD_REQUEST,
|
GST_PAD_REQUEST,
|
||||||
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (FORMATS))
|
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (FORMATS))
|
||||||
|
@ -1754,8 +1754,8 @@ gst_videomixer2_request_new_pad (GstElement * element,
|
||||||
|
|
||||||
mix = GST_VIDEO_MIXER2 (element);
|
mix = GST_VIDEO_MIXER2 (element);
|
||||||
|
|
||||||
if (templ == gst_element_class_get_pad_template (klass, "sink_%d")) {
|
if (templ == gst_element_class_get_pad_template (klass, "sink_%u")) {
|
||||||
gint serial = 0;
|
guint serial = 0;
|
||||||
gchar *name = NULL;
|
gchar *name = NULL;
|
||||||
GstVideoMixer2Collect *mixcol = NULL;
|
GstVideoMixer2Collect *mixcol = NULL;
|
||||||
|
|
||||||
|
@ -1771,7 +1771,7 @@ gst_videomixer2_request_new_pad (GstElement * element,
|
||||||
mix->next_sinkpad = serial + 1;
|
mix->next_sinkpad = serial + 1;
|
||||||
}
|
}
|
||||||
/* create new pad with the name */
|
/* create new pad with the name */
|
||||||
name = g_strdup_printf ("sink_%d", serial);
|
name = g_strdup_printf ("sink_%u", serial);
|
||||||
mixpad = g_object_new (GST_TYPE_VIDEO_MIXER2_PAD, "name", name, "direction",
|
mixpad = g_object_new (GST_TYPE_VIDEO_MIXER2_PAD, "name", name, "direction",
|
||||||
templ->direction, "template", templ, NULL);
|
templ->direction, "template", templ, NULL);
|
||||||
g_free (name);
|
g_free (name);
|
||||||
|
|
|
@ -83,7 +83,7 @@ struct _GstVideoMixer2
|
||||||
GSList *sinkpads;
|
GSList *sinkpads;
|
||||||
gint numpads;
|
gint numpads;
|
||||||
/* Next available sinkpad index */
|
/* Next available sinkpad index */
|
||||||
gint next_sinkpad;
|
guint next_sinkpad;
|
||||||
|
|
||||||
/* Output caps */
|
/* Output caps */
|
||||||
GstVideoInfo info;
|
GstVideoInfo info;
|
||||||
|
|
Loading…
Reference in a new issue