mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

srtpenc: Use %u in templates to match rtpbin

Browse source
This commit is contained in:
Olivier Crête 2014-05-05 22:25:08 -04:00
parent 8c9b1ade36
commit 53a4e05261
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/srtp/gstsrtpenc.c
View file

@ -155,28 +155,28 @@ enum
* describe the real formats here. * describe the real formats here.
*/ */
static GstStaticPadTemplate rtp_sink_template = static GstStaticPadTemplate rtp_sink_template =
GST_STATIC_PAD_TEMPLATE ("rtp_sink_%d", GST_STATIC_PAD_TEMPLATE ("rtp_sink_%u",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_REQUEST, GST_PAD_REQUEST,
GST_STATIC_CAPS ("application/x-rtp") GST_STATIC_CAPS ("application/x-rtp")
); );
static GstStaticPadTemplate rtp_src_template = static GstStaticPadTemplate rtp_src_template =
GST_STATIC_PAD_TEMPLATE ("rtp_src_%d", GST_STATIC_PAD_TEMPLATE ("rtp_src_%u",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_SOMETIMES, GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("application/x-srtp") GST_STATIC_CAPS ("application/x-srtp")
); );
static GstStaticPadTemplate rtcp_sink_template = static GstStaticPadTemplate rtcp_sink_template =
GST_STATIC_PAD_TEMPLATE ("rtcp_sink_%d", GST_STATIC_PAD_TEMPLATE ("rtcp_sink_%u",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_REQUEST, GST_PAD_REQUEST,
GST_STATIC_CAPS ("application/x-rtcp") GST_STATIC_CAPS ("application/x-rtcp")
); );
static GstStaticPadTemplate rtcp_src_template = static GstStaticPadTemplate rtcp_src_template =
GST_STATIC_PAD_TEMPLATE ("rtcp_src_%d", GST_STATIC_PAD_TEMPLATE ("rtcp_src_%u",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_SOMETIMES, GST_PAD_SOMETIMES,
GST_STATIC_CAPS ("application/x-srtcp") GST_STATIC_CAPS ("application/x-srtcp")
@ -427,14 +427,14 @@ create_rtp_sink (GstSrtpEnc * filter, const gchar * name)
{ {
GstPad *sinkpad, *srcpad; GstPad *sinkpad, *srcpad;
gchar *sinkpadname, *srcpadname; gchar *sinkpadname, *srcpadname;
gint nb = 0; guint nb = 0;
GST_DEBUG_OBJECT (filter, "creating RTP sink pad"); GST_DEBUG_OBJECT (filter, "creating RTP sink pad");
sinkpad = gst_pad_new_from_static_template (&rtp_sink_template, name); sinkpad = gst_pad_new_from_static_template (&rtp_sink_template, name);
sinkpadname = gst_pad_get_name (sinkpad); sinkpadname = gst_pad_get_name (sinkpad);
sscanf (sinkpadname, "rtp_sink_%d", &nb); sscanf (sinkpadname, "rtp_sink_%u", &nb);
srcpadname = g_strdup_printf ("rtp_src_%d", nb); srcpadname = g_strdup_printf ("rtp_src_%u", nb);
GST_DEBUG_OBJECT (filter, "creating RTP source pad"); GST_DEBUG_OBJECT (filter, "creating RTP source pad");
srcpad = gst_pad_new_from_static_template (&rtp_src_template, srcpadname); srcpad = gst_pad_new_from_static_template (&rtp_src_template, srcpadname);
@ -471,14 +471,14 @@ create_rtcp_sink (GstSrtpEnc * filter, const gchar * name)
{ {
GstPad *srcpad, *sinkpad; GstPad *srcpad, *sinkpad;
gchar *sinkpadname, *srcpadname; gchar *sinkpadname, *srcpadname;
gint nb = 0; guint nb = 0;
GST_DEBUG_OBJECT (filter, "creating RTCP sink pad"); GST_DEBUG_OBJECT (filter, "creating RTCP sink pad");
sinkpad = gst_pad_new_from_static_template (&rtcp_sink_template, name); sinkpad = gst_pad_new_from_static_template (&rtcp_sink_template, name);
sinkpadname = gst_pad_get_name (sinkpad); sinkpadname = gst_pad_get_name (sinkpad);
sscanf (sinkpadname, "rtcp_sink_%d", &nb); sscanf (sinkpadname, "rtcp_sink_%u", &nb);
srcpadname = g_strdup_printf ("rtcp_src_%d", nb); srcpadname = g_strdup_printf ("rtcp_src_%u", nb);
GST_DEBUG_OBJECT (filter, "creating RTCP source pad"); GST_DEBUG_OBJECT (filter, "creating RTCP source pad");
srcpad = gst_pad_new_from_static_template (&rtcp_src_template, srcpadname); srcpad = gst_pad_new_from_static_template (&rtcp_src_template, srcpadname);
@ -521,10 +521,10 @@ gst_srtp_enc_request_new_pad (GstElement * element,
GST_INFO_OBJECT (element, "New pad requested"); GST_INFO_OBJECT (element, "New pad requested");
if (templ == gst_element_class_get_pad_template (klass, "rtp_sink_%d")) if (templ == gst_element_class_get_pad_template (klass, "rtp_sink_%u"))
return create_rtp_sink (filter, name); return create_rtp_sink (filter, name);
if (templ == gst_element_class_get_pad_template (klass, "rtcp_sink_%d")) if (templ == gst_element_class_get_pad_template (klass, "rtcp_sink_%u"))
return create_rtcp_sink (filter, name); return create_rtcp_sink (filter, name);
GST_ERROR_OBJECT (element, "Could not find specified template"); GST_ERROR_OBJECT (element, "Could not find specified template");