mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

make request pads take _%u

Browse source
This commit is contained in:
Wim Taymans 2011-11-04 12:22:37 +01:00
parent 8e5579c594
commit c8adc4f8c8
15 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/mplex/gstmplex.cc
View file

@ -67,7 +67,7 @@ static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src",
);
static GstStaticPadTemplate video_sink_templ =
GST_STATIC_PAD_TEMPLATE ("video_%d",
GST_STATIC_PAD_TEMPLATE ("video_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/mpeg, "
@ -82,7 +82,7 @@ GST_STATIC_PAD_TEMPLATE ("video_%d",
"rate = (int) [ 8000, 96000 ]"
static GstStaticPadTemplate audio_sink_templ =
GST_STATIC_PAD_TEMPLATE ("audio_%d",
GST_STATIC_PAD_TEMPLATE ("audio_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("audio/mpeg, "
@ -609,12 +609,12 @@ gst_mplex_request_new_pad (GstElement * element,
GstPad *newpad;
GstMplexPad *mpad;
if (templ == gst_element_class_get_pad_template (klass, "audio_%d")) {
if (templ == gst_element_class_get_pad_template (klass, "audio_%u")) {
GST_DEBUG_OBJECT (mplex, "request pad audio %d", mplex->num_apads);
padname = g_strdup_printf ("audio_%d", mplex->num_apads++);
} else if (templ == gst_element_class_get_pad_template (klass, "video_%d")) {
padname = g_strdup_printf ("audio_%u", mplex->num_apads++);
} else if (templ == gst_element_class_get_pad_template (klass, "video_%u")) {
GST_DEBUG_OBJECT (mplex, "request pad video %d", mplex->num_vpads);
padname = g_strdup_printf ("video_%d", mplex->num_vpads++);
padname = g_strdup_printf ("video_%u", mplex->num_vpads++);
} else {
GST_WARNING_OBJECT (mplex, "This is not our template!");
return NULL;

4
ext/resindvd/rsnstreamselector.c
View file

@ -33,7 +33,7 @@ GST_DEBUG_CATEGORY_STATIC (stream_selector_debug);
#define GST_CAT_DEFAULT stream_selector_debug
static GstStaticPadTemplate rsn_stream_selector_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink%d",
GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS_ANY);
@ -724,7 +724,7 @@ rsn_stream_selector_request_new_pad (GstElement * element,
g_return_val_if_fail (templ->direction == GST_PAD_SINK, NULL);
GST_LOG_OBJECT (sel, "Creating new pad %d", sel->padcount);
GST_OBJECT_LOCK (sel);
name = g_strdup_printf ("sink%d", sel->padcount++);
name = g_strdup_printf ("sink_%u", sel->padcount++);
sinkpad = g_object_new (RSN_TYPE_SELECTOR_PAD,
"name", name, "direction", templ->direction, "template", templ, NULL);
g_free (name);

12
gst/asfmux/gstasfmux.c
View file

@ -136,13 +136,13 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
);
static GstStaticPadTemplate video_sink_factory =
GST_STATIC_PAD_TEMPLATE ("video_%d",
GST_STATIC_PAD_TEMPLATE ("video_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/x-wmv, wmvversion = (int) [1,3]"));
static GstStaticPadTemplate audio_sink_factory =
GST_STATIC_PAD_TEMPLATE ("audio_%d",
GST_STATIC_PAD_TEMPLATE ("audio_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("audio/x-wma, wmaversion = (int) [1,3]; "
@ -2251,16 +2251,16 @@ gst_asf_mux_request_new_pad (GstElement * element,
return NULL;
}
if (templ == gst_element_class_get_pad_template (klass, "audio_%d")) {
name = g_strdup_printf ("audio_%02d", asfmux->stream_number + 1);
if (templ == gst_element_class_get_pad_template (klass, "audio_%u")) {
name = g_strdup_printf ("audio_%u", asfmux->stream_number + 1);
GST_DEBUG_OBJECT (asfmux, "Adding new pad %s", name);
newpad = gst_pad_new_from_template (templ, name);
g_free (name);
is_audio = TRUE;
gst_pad_set_setcaps_function (newpad,
GST_DEBUG_FUNCPTR (gst_asf_mux_audio_set_caps));
} else if (templ == gst_element_class_get_pad_template (klass, "video_%d")) {
name = g_strdup_printf ("video_%02d", asfmux->stream_number + 1);
} else if (templ == gst_element_class_get_pad_template (klass, "video_%u")) {
name = g_strdup_printf ("video_%u", asfmux->stream_number + 1);
GST_DEBUG_OBJECT (asfmux, "Adding new pad %s", name);
newpad = gst_pad_new_from_template (templ, name);
g_free (name);

4
gst/camerabin/gstinputselector.c
View file

@ -42,7 +42,7 @@ GST_DEBUG_CATEGORY_STATIC (input_selector_debug);
#define GST_CAT_DEFAULT input_selector_debug
static GstStaticPadTemplate gst_input_selector_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink%d",
GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS_ANY);
@ -1298,7 +1298,7 @@ gst_input_selector_request_new_pad (GstElement * element,
GST_INPUT_SELECTOR_LOCK (sel);
GST_LOG_OBJECT (sel, "Creating new pad %d", sel->padcount);
name = g_strdup_printf ("sink%d", sel->padcount++);
name = g_strdup_printf ("sink_%u", sel->padcount++);
sinkpad = g_object_new (GST_TYPE_SELECTOR_PAD,
"name", name, "direction", templ->direction, "template", templ, NULL);
g_free (name);

4
gst/liveadder/liveadder.c
View file

@ -54,7 +54,7 @@ GST_DEBUG_CATEGORY_STATIC (live_adder_debug);
#define GST_CAT_DEFAULT (live_adder_debug)
static GstStaticPadTemplate gst_live_adder_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink%d",
GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS "; "
@ -1383,7 +1383,7 @@ gst_live_adder_request_new_pad (GstElement * element, GstPadTemplate * templ,
padcount = g_atomic_int_exchange_and_add (&adder->padcount, 1);
#endif
name = g_strdup_printf ("sink%d", padcount);
name = g_strdup_printf ("sink_%u", padcount);
newpad = gst_pad_new_from_template (templ, name);
GST_DEBUG_OBJECT (adder, "request new pad %s", name);
g_free (name);

8
gst/mixmatrix/mixmatrix.c
View file

@ -85,14 +85,14 @@ enum
};
static GstStaticPadTemplate mixmatrix_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink%d",
GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS)
);
static GstStaticPadTemplate mixmatrix_src_template =
GST_STATIC_PAD_TEMPLATE ("src%d",
GST_STATIC_PAD_TEMPLATE ("src_%u",
GST_PAD_SRC,
GST_PAD_REQUEST,
GST_STATIC_CAPS (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS)
@ -370,7 +370,7 @@ gst_mixmatrix_request_new_pad (GstElement * element, GstPadTemplate * templ,
mix = GST_MIXMATRIX (element);
/* figure out if it's a sink pad */
if (sscanf (name, "sink%d", &padnum)) {
if (sscanf (name, "sink_%u", &padnum)) {
/* check to see if it already exists */
if (padnum < mix->sinkpadalloc && mix->sinkpads[padnum])
return mix->sinkpads[padnum];
@ -393,7 +393,7 @@ gst_mixmatrix_request_new_pad (GstElement * element, GstPadTemplate * templ,
mix->sinkpads[padnum] = pad;
}
/* or it's a src pad */
else if (sscanf (name, "src%d", &padnum)) {
else if (sscanf (name, "src_%u", &padnum)) {
/* check to see if it already exists */
if (padnum < mix->srcpadalloc && mix->srcpads[padnum])
return mix->srcpads[padnum];

4
gst/mpeg1sys/gstmpeg1systemencode.c
View file

@ -47,7 +47,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS ("video/mpeg, " "systemstream = (boolean) TRUE")
);
static GstStaticPadTemplate video_sink_factory =
GST_STATIC_PAD_TEMPLATE ("video_%d",
GST_STATIC_PAD_TEMPLATE ("video_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/mpeg, "
@ -55,7 +55,7 @@ GST_STATIC_PAD_TEMPLATE ("video_%d",
);
static GstStaticPadTemplate audio_sink_factory =
GST_STATIC_PAD_TEMPLATE ("audio_%d",
GST_STATIC_PAD_TEMPLATE ("audio_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("audio/mpeg, "

8
gst/mpegdemux/mpegtsparse.c
View file

@ -93,13 +93,13 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
);
static GstStaticPadTemplate src_template =
GST_STATIC_PAD_TEMPLATE ("src%d", GST_PAD_SRC,
GST_STATIC_PAD_TEMPLATE ("src_%u", GST_PAD_SRC,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/mpegts, " "systemstream = (boolean) true ")
);
static GstStaticPadTemplate program_template =
GST_STATIC_PAD_TEMPLATE ("program_%d", GST_PAD_SRC,
GST_STATIC_PAD_TEMPLATE ("program_%u", GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("video/mpegts, " "systemstream = (boolean) true ")
);
@ -404,7 +404,7 @@ mpegts_parse_activate_program (MpegTSParse * parse,
MpegTSParsePad *tspad;
gchar *pad_name;
pad_name = g_strdup_printf ("program_%d", program->program_number);
pad_name = g_strdup_printf ("program_%u", program->program_number);
tspad = mpegts_parse_create_tspad (parse, pad_name);
tspad->program_number = program->program_number;
@ -669,7 +669,7 @@ mpegts_parse_request_new_pad (GstElement * element, GstPadTemplate * template,
parse = GST_MPEGTS_PARSE (element);
GST_OBJECT_LOCK (element);
name = g_strdup_printf ("src%d", parse->req_pads++);
name = g_strdup_printf ("src_%u", parse->req_pads++);
GST_OBJECT_UNLOCK (element);
pad = mpegts_parse_create_tspad (parse, name)->pad;

2
gst/mpegpsmux/mpegpsmux.c
View file

@ -58,7 +58,7 @@ enum
};
static GstStaticPadTemplate mpegpsmux_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink_%d",
GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/mpeg, "

8
gst/mpegtsdemux/mpegtsparse.c
View file

@ -70,13 +70,13 @@ struct _MpegTSParsePad
};
static GstStaticPadTemplate src_template =
GST_STATIC_PAD_TEMPLATE ("src%d", GST_PAD_SRC,
GST_STATIC_PAD_TEMPLATE ("src_%u", GST_PAD_SRC,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/mpegts, " "systemstream = (boolean) true ")
);
static GstStaticPadTemplate program_template =
GST_STATIC_PAD_TEMPLATE ("program_%d", GST_PAD_SRC,
GST_STATIC_PAD_TEMPLATE ("program_%u", GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("video/mpegts, " "systemstream = (boolean) true ")
);
@ -221,7 +221,7 @@ mpegts_parse_activate_program (MpegTSParse2 * parse,
gchar *pad_name;
pad_name =
g_strdup_printf ("program_%d",
g_strdup_printf ("program_%u",
((MpegTSBaseProgram *) program)->program_number);
tspad = mpegts_parse_create_tspad (parse, pad_name);
@ -436,7 +436,7 @@ mpegts_parse_request_new_pad (GstElement * element, GstPadTemplate * template,
parse = GST_MPEGTS_PARSE (element);
GST_OBJECT_LOCK (element);
name = g_strdup_printf ("src%d", parse->req_pads++);
name = g_strdup_printf ("src_%u", parse->req_pads++);
GST_OBJECT_UNLOCK (element);
pad = mpegts_parse_create_tspad (parse, name)->pad;

6
gst/mpegtsmux/mpegtsmux.c
View file

@ -106,7 +106,7 @@ enum
};
static GstStaticPadTemplate mpegtsmux_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink_%d",
GST_STATIC_PAD_TEMPLATE ("sink_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/mpeg, "
@ -749,14 +749,14 @@ mpegtsmux_request_new_pad (GstElement * element,
GstPad *pad = NULL;
MpegTsPadData *pad_data = NULL;
if (name != NULL && sscanf (name, "sink_%d", &pid) == 1) {
if (name != NULL && sscanf (name, "sink_%u", &pid) == 1) {
if (tsmux_find_stream (mux->tsmux, pid))
goto stream_exists;
} else {
pid = tsmux_get_new_pid (mux->tsmux);
}
pad_name = g_strdup_printf ("sink_%d", pid);
pad_name = g_strdup_printf ("sink_%u", pid);
pad = gst_pad_new_from_template (templ, pad_name);
g_free (pad_name);

8
gst/rtpmux/gstrtpdtmfmux.c
View file

@ -31,8 +31,8 @@
*
* The RTP "DTMF" Muxer muxes multiple RTP streams into a valid RTP
* stream. It does exactly what it's parent (#rtpmux) does, except
* that it prevent buffers coming over a regular sink_%%d pad from going through
* for the duration of buffers that came in a priority_sink_%%d pad.
* that it prevent buffers coming over a regular sink_%%u pad from going through
* for the duration of buffers that came in a priority_sink_%%u pad.
*
* This is especially useful if a discontinuous source like dtmfsrc or
* rtpdtmfsrc are connected to the priority sink pads. This way, the generated
@ -52,7 +52,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtp_dtmf_mux_debug);
#define GST_CAT_DEFAULT gst_rtp_dtmf_mux_debug
static GstStaticPadTemplate priority_sink_factory =
GST_STATIC_PAD_TEMPLATE ("priority_sink_%d",
GST_STATIC_PAD_TEMPLATE ("priority_sink_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("application/x-rtp"));
@ -168,7 +168,7 @@ gst_rtp_dtmf_mux_request_new_pad (GstElement * element, GstPadTemplate * templ,
padpriv = gst_pad_get_element_private (pad);
if (gst_element_class_get_pad_template (GST_ELEMENT_GET_CLASS (element),
"priority_sink_%d") == gst_pad_get_pad_template (pad))
"priority_sink_%u") == gst_pad_get_pad_template (pad))
padpriv->priority = TRUE;
GST_OBJECT_UNLOCK (element);
}

6
gst/rtpmux/gstrtpmux.c
View file

@ -82,7 +82,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS ("application/x-rtp")
);
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_REQUEST,
GST_STATIC_CAPS ("application/x-rtp")
@ -107,7 +107,7 @@ static void gst_rtp_mux_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
static void gst_rtp_mux_dispose (GObject * object);
static gboolean gst_rtp_mux_src_event_real (GstRTPMux *rtp_mux,
static gboolean gst_rtp_mux_src_event_real (GstRTPMux * rtp_mux,
GstEvent * event);
GST_BOILERPLATE (GstRTPMux, gst_rtp_mux, GstElement, GST_TYPE_ELEMENT);
@ -204,7 +204,7 @@ gst_rtp_mux_src_event (GstPad * pad, GstEvent * event)
}
static gboolean
gst_rtp_mux_src_event_real (GstRTPMux *rtp_mux, GstEvent * event)
gst_rtp_mux_src_event_real (GstRTPMux * rtp_mux, GstEvent * event)
{
GstIterator *iter;
GstPad *sinkpad;

16
gst/videomeasure/gstvideomeasure_ssim.c
View file

@ -78,7 +78,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
"depth = (int) 8 "
static GstStaticPadTemplate gst_ssim_src_template =
GST_STATIC_PAD_TEMPLATE ("src%d",
GST_STATIC_PAD_TEMPLATE ("src_%u",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS (SRC_CAPS)
@ -92,7 +92,7 @@ GST_STATIC_PAD_TEMPLATE ("original",
);
static GstStaticPadTemplate gst_ssim_sink_modified_template =
GST_STATIC_PAD_TEMPLATE ("modified%d",
GST_STATIC_PAD_TEMPLATE ("modified_%u",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS (SINK_CAPS)
@ -1125,7 +1125,7 @@ gst_ssim_request_new_pad (GstElement * element, GstPadTemplate * templ,
GstPad *newsrc;
gint padcount;
GstPadTemplate *template;
gint num = -1;
guint num = -1;
if (templ->direction != GST_PAD_SINK)
goto not_sink;
@ -1145,9 +1145,9 @@ gst_ssim_request_new_pad (GstElement * element, GstPadTemplate * templ,
newpad = gst_pad_new_from_template (templ, "original");
GST_DEBUG_OBJECT (ssim, "request new sink pad original");
ssim->orig = newpad;
} else if (strncmp (padname, "modified", 8) == 0) {
const gchar *numstr = &padname[8];
num = strtol (numstr, NULL, 10);
} else if (strncmp (padname, "modified_", 9) == 0) {
const gchar *numstr = &padname[9];
num = strtoul (numstr, NULL, 10);
if (errno == EINVAL || errno == ERANGE)
goto bad_name;
newpad = gst_pad_new_from_template (templ, padname);
@ -1181,11 +1181,11 @@ gst_ssim_request_new_pad (GstElement * element, GstPadTemplate * templ,
padcount = g_atomic_int_exchange_and_add (&ssim->padcount, 1);
#endif
if (num >= 0) {
if (num != -1) {
GstSSimOutputContext *c;
template = gst_static_pad_template_get (&gst_ssim_src_template);
name = g_strdup_printf ("src%d", num);
name = g_strdup_printf ("src_%u", num);
newsrc = gst_pad_new_from_template (template, name);
GST_DEBUG_OBJECT (ssim, "creating src pad %s", name);
g_free (name);

6
sys/dvb/dvbbasebin.c
View file

@ -34,13 +34,13 @@ GST_DEBUG_CATEGORY_STATIC (dvb_base_bin_debug);
#define GST_CAT_DEFAULT dvb_base_bin_debug
static GstStaticPadTemplate src_template =
GST_STATIC_PAD_TEMPLATE ("src%d", GST_PAD_SRC,
GST_STATIC_PAD_TEMPLATE ("src_%u", GST_PAD_SRC,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/mpegts, " "systemstream = (boolean) true ")
);
static GstStaticPadTemplate program_template =
GST_STATIC_PAD_TEMPLATE ("program_%d", GST_PAD_SRC,
GST_STATIC_PAD_TEMPLATE ("program_%u", GST_PAD_SRC,
GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("video/mpegts, " "systemstream = (boolean) true ")
);
@ -563,7 +563,7 @@ dvb_base_bin_init_cam (DvbBaseBin * dvbbasebin)
if (cam_device_open (dvbbasebin->hwcam, ca_file)) {
/* HACK: poll the cam in a buffer probe */
dvbbasebin->ts_pad =
gst_element_get_request_pad (dvbbasebin->mpegtsparse, "src%d");
gst_element_get_request_pad (dvbbasebin->mpegtsparse, "src_%u");
gst_pad_add_probe (dvbbasebin->ts_pad, GST_PAD_PROBE_TYPE_BLOCK,
dvb_base_bin_ts_pad_probe_cb, dvbbasebin, NULL);
} else {