*/
/**
- * SECTION:element-gstrtpssrcdemux
+ * SECTION:element-rtpssrcdemux
+ * @title: rtpssrcdemux
*
- * gstrtpssrcdemux acts as a demuxer for RTP packets based on the SSRC of the
+ * rtpssrcdemux acts as a demuxer for RTP packets based on the SSRC of the
* packets. Its main purpose is to allow an application to easily receive and
* decode an RTP stream with multiple SSRCs.
- *
+ *
* For each SSRC that is detected, a new pad will be created and the
- * #GstRtpSsrcDemux::new-ssrc-pad signal will be emitted.
- *
- * <refsect2>
- * <title>Example pipelines</title>
+ * #GstRtpSsrcDemux::new-ssrc-pad signal will be emitted.
+ *
+ * ## Example pipelines
* |[
- * gst-launch-1.0 udpsrc caps="application/x-rtp" ! gstrtpssrcdemux ! fakesink
+ * gst-launch-1.0 udpsrc caps="application/x-rtp" ! rtpssrcdemux ! fakesink
* ]| Takes an RTP stream and send the RTP packets with the first detected SSRC
* to fakesink, discarding the other SSRCs.
- * </refsect2>
*
- * Last reviewed on 2007-05-28 (0.10.5)
*/
#ifdef HAVE_CONFIG_H
#include <gst/rtp/gstrtpbuffer.h>
#include <gst/rtp/gstrtcpbuffer.h>
-#include "gstrtpbin-marshal.h"
#include "gstrtpssrcdemux.h"
GST_DEBUG_CATEGORY_STATIC (gst_rtp_ssrc_demux_debug);
GST_STATIC_CAPS ("application/x-rtcp")
);
-#define GST_PAD_LOCK(obj) (g_rec_mutex_lock (&(obj)->padlock))
-#define GST_PAD_UNLOCK(obj) (g_rec_mutex_unlock (&(obj)->padlock))
+#define INTERNAL_STREAM_LOCK(obj) (g_rec_mutex_lock (&(obj)->padlock))
+#define INTERNAL_STREAM_UNLOCK(obj) (g_rec_mutex_unlock (&(obj)->padlock))
typedef enum
{
RTCP_PAD
} PadType;
+#define DEFAULT_MAX_STREAMS G_MAXUINT
+enum
+{
+ PROP_0,
+ PROP_MAX_STREAMS
+};
+
/* signals */
enum
{
static GstFlowReturn gst_rtp_ssrc_demux_rtcp_chain (GstPad * pad,
GstObject * parent, GstBuffer * buf);
-static gboolean gst_rtp_ssrc_demux_rtcp_sink_event (GstPad * pad,
- GstObject * parent, GstEvent * event);
static GstIterator *gst_rtp_ssrc_demux_iterate_internal_links_sink (GstPad *
pad, GstObject * parent);
};
/* find a src pad for a given SSRC, returns NULL if the SSRC was not found
+ * MUST be called with object lock
*/
static GstRtpSsrcDemuxPad *
find_demux_pad_for_ssrc (GstRtpSsrcDemux * demux, guint32 ssrc)
return NULL;
}
+/* returns a reference to the pad if found, %NULL otherwise */
+static GstPad *
+get_demux_pad_for_ssrc (GstRtpSsrcDemux * demux, guint32 ssrc, PadType padtype)
+{
+ GstRtpSsrcDemuxPad *demuxpad;
+ GstPad *retpad;
+
+ GST_OBJECT_LOCK (demux);
+
+ demuxpad = find_demux_pad_for_ssrc (demux, ssrc);
+ if (!demuxpad) {
+ GST_OBJECT_UNLOCK (demux);
+ return NULL;
+ }
+
+ switch (padtype) {
+ case RTP_PAD:
+ retpad = gst_object_ref (demuxpad->rtp_pad);
+ break;
+ case RTCP_PAD:
+ retpad = gst_object_ref (demuxpad->rtcp_pad);
+ break;
+ default:
+ retpad = NULL;
+ g_assert_not_reached ();
+ }
+
+ GST_OBJECT_UNLOCK (demux);
+
+ return retpad;
+}
+
static GstEvent *
add_ssrc_and_ref (GstEvent * event, guint32 ssrc)
{
return event;
}
-struct ForwardEventData
+struct ForwardStickyEventData
{
GstPad *pad;
guint32 ssrc;
};
+/* With internal stream lock held */
static gboolean
forward_sticky_events (GstPad * pad, GstEvent ** event, gpointer user_data)
{
- struct ForwardEventData *data = user_data;
+ struct ForwardStickyEventData *data = user_data;
GstEvent *newevent;
newevent = add_ssrc_and_ref (*event, data->ssrc);
return TRUE;
}
+/* With internal stream lock held */
+static void
+forward_initial_events (GstRtpSsrcDemux * demux, guint32 ssrc, GstPad * pad,
+ PadType padtype)
+{
+ struct ForwardStickyEventData fdata;
+ GstPad *sinkpad = NULL;
+
+ if (padtype == RTP_PAD)
+ sinkpad = demux->rtp_sink;
+ else if (padtype == RTCP_PAD)
+ sinkpad = demux->rtcp_sink;
+ else
+ g_assert_not_reached ();
+
+ fdata.ssrc = ssrc;
+ fdata.pad = pad;
+
+ gst_pad_sticky_events_foreach (sinkpad, forward_sticky_events, &fdata);
+}
+/* MUST only be called from streaming thread */
static GstPad *
find_or_create_demux_pad_for_ssrc (GstRtpSsrcDemux * demux, guint32 ssrc,
PadType padtype)
GstPadTemplate *templ;
gchar *padname;
GstRtpSsrcDemuxPad *demuxpad;
- GstCaps *caps;
- struct ForwardEventData fdata;
GstPad *retpad;
- gulong rtp_block, rtcp_block;
-
- GST_DEBUG_OBJECT (demux, "creating pad for SSRC %08x", ssrc);
+ guint num_streams;
- GST_PAD_LOCK (demux);
+ INTERNAL_STREAM_LOCK (demux);
- demuxpad = find_demux_pad_for_ssrc (demux, ssrc);
- if (demuxpad != NULL) {
- switch (padtype) {
- case RTP_PAD:
- retpad = gst_object_ref (demuxpad->rtp_pad);
- break;
- case RTCP_PAD:
- retpad = gst_object_ref (demuxpad->rtcp_pad);
- break;
- default:
- retpad = NULL;
- g_assert_not_reached ();
- }
- GST_PAD_UNLOCK (demux);
+ retpad = get_demux_pad_for_ssrc (demux, ssrc, padtype);
+ if (retpad != NULL) {
+ INTERNAL_STREAM_UNLOCK (demux);
return retpad;
}
+ /* We create 2 src pads per ssrc (RTP & RTCP). Checking if we are allowed
+ to create 2 more pads */
+ num_streams = (GST_ELEMENT_CAST (demux)->numsrcpads) >> 1;
+ if (num_streams >= demux->max_streams) {
+ INTERNAL_STREAM_UNLOCK (demux);
+ return NULL;
+ }
+
+ GST_DEBUG_OBJECT (demux, "creating new pad for SSRC %08x", ssrc);
klass = GST_ELEMENT_GET_CLASS (demux);
templ = gst_element_class_get_pad_template (klass, "src_%u");
demuxpad->rtp_pad = rtp_pad;
demuxpad->rtcp_pad = rtcp_pad;
- fdata.ssrc = ssrc;
-
gst_pad_set_element_private (rtp_pad, demuxpad);
gst_pad_set_element_private (rtcp_pad, demuxpad);
+ GST_OBJECT_LOCK (demux);
demux->srcpads = g_slist_prepend (demux->srcpads, demuxpad);
+ GST_OBJECT_UNLOCK (demux);
gst_pad_set_query_function (rtp_pad, gst_rtp_ssrc_demux_src_query);
gst_pad_set_iterate_internal_links_function (rtp_pad,
gst_pad_set_event_function (rtp_pad, gst_rtp_ssrc_demux_src_event);
gst_pad_use_fixed_caps (rtp_pad);
gst_pad_set_active (rtp_pad, TRUE);
- fdata.pad = rtp_pad;
- gst_pad_sticky_events_foreach (demux->rtp_sink, forward_sticky_events,
- &fdata);
gst_pad_set_event_function (rtcp_pad, gst_rtp_ssrc_demux_src_event);
gst_pad_set_iterate_internal_links_function (rtcp_pad,
gst_rtp_ssrc_demux_iterate_internal_links_src);
gst_pad_use_fixed_caps (rtcp_pad);
gst_pad_set_active (rtcp_pad, TRUE);
- fdata.pad = rtcp_pad;
- gst_pad_sticky_events_foreach (demux->rtcp_sink, forward_sticky_events,
- &fdata);
-
- /* copy caps from input */
- if ((caps = gst_pad_get_current_caps (demux->rtp_sink))) {
- gst_pad_set_caps (rtp_pad, caps);
- gst_caps_unref (caps);
- }
- if ((caps = gst_pad_get_current_caps (demux->rtcp_sink))) {
- gst_pad_set_caps (rtcp_pad, caps);
- gst_caps_unref (caps);
- }
+
+ forward_initial_events (demux, ssrc, rtp_pad, RTP_PAD);
+ forward_initial_events (demux, ssrc, rtcp_pad, RTCP_PAD);
+
gst_element_add_pad (GST_ELEMENT_CAST (demux), rtp_pad);
gst_element_add_pad (GST_ELEMENT_CAST (demux), rtcp_pad);
g_assert_not_reached ();
}
- gst_object_ref (rtp_pad);
- gst_object_ref (rtcp_pad);
+ g_signal_emit (G_OBJECT (demux),
+ gst_rtp_ssrc_demux_signals[SIGNAL_NEW_SSRC_PAD], 0, ssrc, rtp_pad);
- rtp_block = gst_pad_add_probe (rtp_pad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM,
- NULL, NULL, NULL);
- rtcp_block = gst_pad_add_probe (rtcp_pad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM,
- NULL, NULL, NULL);
+ INTERNAL_STREAM_UNLOCK (demux);
- GST_PAD_UNLOCK (demux);
+ return retpad;
+}
- g_signal_emit (G_OBJECT (demux),
- gst_rtp_ssrc_demux_signals[SIGNAL_NEW_SSRC_PAD], 0, ssrc, rtp_pad);
+static void
+gst_rtp_ssrc_demux_set_property (GObject * object, guint prop_id,
+ const GValue * value, GParamSpec * pspec)
+{
+ GstRtpSsrcDemux *demux;
- gst_pad_remove_probe (rtp_pad, rtp_block);
- gst_pad_remove_probe (rtcp_pad, rtcp_block);
+ demux = GST_RTP_SSRC_DEMUX (object);
+ switch (prop_id) {
+ case PROP_MAX_STREAMS:
+ demux->max_streams = g_value_get_uint (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
- gst_object_unref (rtp_pad);
- gst_object_unref (rtcp_pad);
+static void
+gst_rtp_ssrc_demux_get_property (GObject * object, guint prop_id,
+ GValue * value, GParamSpec * pspec)
+{
+ GstRtpSsrcDemux *demux;
- return retpad;
+ demux = GST_RTP_SSRC_DEMUX (object);
+ switch (prop_id) {
+ case PROP_MAX_STREAMS:
+ g_value_set_uint (value, demux->max_streams);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
static void
gobject_klass->dispose = gst_rtp_ssrc_demux_dispose;
gobject_klass->finalize = gst_rtp_ssrc_demux_finalize;
+ gobject_klass->set_property = gst_rtp_ssrc_demux_set_property;
+ gobject_klass->get_property = gst_rtp_ssrc_demux_get_property;
+
+ g_object_class_install_property (gobject_klass, PROP_MAX_STREAMS,
+ g_param_spec_uint ("max-streams", "Max Streams",
+ "The maximum number of streams allowed",
+ 0, G_MAXUINT, DEFAULT_MAX_STREAMS,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* GstRtpSsrcDemux::new-ssrc-pad:
* @ssrc: the SSRC of the pad
* @pad: the new pad.
*
- * Emited when a new SSRC pad has been created.
+ * Emitted when a new SSRC pad has been created.
*/
gst_rtp_ssrc_demux_signals[SIGNAL_NEW_SSRC_PAD] =
g_signal_new ("new-ssrc-pad",
G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstRtpSsrcDemuxClass, new_ssrc_pad),
- NULL, NULL, gst_rtp_bin_marshal_VOID__UINT_OBJECT,
- G_TYPE_NONE, 2, G_TYPE_UINT, GST_TYPE_PAD);
+ NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, GST_TYPE_PAD);
/**
* GstRtpSsrcDemux::removed-ssrc-pad:
* @ssrc: the SSRC of the pad
* @pad: the removed pad.
*
- * Emited when a SSRC pad has been removed.
+ * Emitted when a SSRC pad has been removed.
*/
gst_rtp_ssrc_demux_signals[SIGNAL_REMOVED_SSRC_PAD] =
g_signal_new ("removed-ssrc-pad",
G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstRtpSsrcDemuxClass, removed_ssrc_pad),
- NULL, NULL, gst_rtp_bin_marshal_VOID__UINT_OBJECT,
- G_TYPE_NONE, 2, G_TYPE_UINT, GST_TYPE_PAD);
+ NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, GST_TYPE_PAD);
/**
* GstRtpSsrcDemux::clear-ssrc:
g_signal_new ("clear-ssrc",
G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GstRtpSsrcDemuxClass, clear_ssrc),
- NULL, NULL, gst_rtp_bin_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT);
+ NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT);
gstelement_klass->change_state =
GST_DEBUG_FUNCPTR (gst_rtp_ssrc_demux_change_state);
gstrtpssrcdemux_klass->clear_ssrc =
GST_DEBUG_FUNCPTR (gst_rtp_ssrc_demux_clear_ssrc);
- gst_element_class_add_pad_template (gstelement_klass,
- gst_static_pad_template_get (&rtp_ssrc_demux_sink_template));
- gst_element_class_add_pad_template (gstelement_klass,
- gst_static_pad_template_get (&rtp_ssrc_demux_rtcp_sink_template));
- gst_element_class_add_pad_template (gstelement_klass,
- gst_static_pad_template_get (&rtp_ssrc_demux_src_template));
- gst_element_class_add_pad_template (gstelement_klass,
- gst_static_pad_template_get (&rtp_ssrc_demux_rtcp_src_template));
+ gst_element_class_add_static_pad_template (gstelement_klass,
+ &rtp_ssrc_demux_sink_template);
+ gst_element_class_add_static_pad_template (gstelement_klass,
+ &rtp_ssrc_demux_rtcp_sink_template);
+ gst_element_class_add_static_pad_template (gstelement_klass,
+ &rtp_ssrc_demux_src_template);
+ gst_element_class_add_static_pad_template (gstelement_klass,
+ &rtp_ssrc_demux_rtcp_src_template);
gst_element_class_set_static_metadata (gstelement_klass, "RTP SSRC Demux",
"Demux/Network/RTP",
GST_DEBUG_CATEGORY_INIT (gst_rtp_ssrc_demux_debug,
"rtpssrcdemux", 0, "RTP SSRC demuxer");
+
+ GST_DEBUG_REGISTER_FUNCPTR (gst_rtp_ssrc_demux_chain);
+ GST_DEBUG_REGISTER_FUNCPTR (gst_rtp_ssrc_demux_rtcp_chain);
}
static void
gst_pad_new_from_template (gst_element_class_get_pad_template (klass,
"rtcp_sink"), "rtcp_sink");
gst_pad_set_chain_function (demux->rtcp_sink, gst_rtp_ssrc_demux_rtcp_chain);
- gst_pad_set_event_function (demux->rtcp_sink,
- gst_rtp_ssrc_demux_rtcp_sink_event);
+ gst_pad_set_event_function (demux->rtcp_sink, gst_rtp_ssrc_demux_sink_event);
gst_pad_set_iterate_internal_links_function (demux->rtcp_sink,
gst_rtp_ssrc_demux_iterate_internal_links_sink);
gst_element_add_pad (GST_ELEMENT_CAST (demux), demux->rtcp_sink);
- g_rec_mutex_init (&demux->padlock);
+ demux->max_streams = DEFAULT_MAX_STREAMS;
- gst_segment_init (&demux->segment, GST_FORMAT_UNDEFINED);
+ g_rec_mutex_init (&demux->padlock);
}
static void
{
GstRtpSsrcDemuxPad *dpad;
- GST_PAD_LOCK (demux);
+ GST_OBJECT_LOCK (demux);
dpad = find_demux_pad_for_ssrc (demux, ssrc);
if (dpad == NULL) {
- GST_PAD_UNLOCK (demux);
+ GST_OBJECT_UNLOCK (demux);
goto unknown_pad;
}
GST_DEBUG_OBJECT (demux, "clearing pad for SSRC %08x", ssrc);
demux->srcpads = g_slist_remove (demux->srcpads, dpad);
- GST_PAD_UNLOCK (demux);
+ GST_OBJECT_UNLOCK (demux);
gst_pad_set_active (dpad->rtp_pad, FALSE);
gst_pad_set_active (dpad->rtcp_pad, FALSE);
}
}
-static gboolean
-gst_rtp_ssrc_demux_sink_event (GstPad * pad, GstObject * parent,
- GstEvent * event)
+struct ForwardEventData
{
GstRtpSsrcDemux *demux;
- gboolean res = FALSE;
-
- demux = GST_RTP_SSRC_DEMUX (parent);
-
- switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_FLUSH_STOP:
- gst_segment_init (&demux->segment, GST_FORMAT_UNDEFINED);
- /* fallthrough */
- default:
- {
- GSList *walk;
- GSList *pads = NULL;
-
- res = TRUE;
- /* need local snapshot of pads;
- * should not push downstream while holding lock as that might deadlock
- * with stuff traveling upstream tyring to get this lock while holding
- * other (stream)lock */
- GST_PAD_LOCK (demux);
- for (walk = demux->srcpads; walk; walk = g_slist_next (walk)) {
- GstRtpSsrcDemuxPad *pad = (GstRtpSsrcDemuxPad *) walk->data;
-
- pad = g_slice_dup (GstRtpSsrcDemuxPad, pad);
- gst_object_ref (pad->rtp_pad);
-
- pads = g_slist_prepend (pads, pad);
- }
- GST_PAD_UNLOCK (demux);
+ GstEvent *event;
+ gboolean res;
+ GstPad *pad;
+};
- for (walk = pads; walk; walk = g_slist_next (walk)) {
- GstRtpSsrcDemuxPad *dpad = walk->data;
- GstEvent *newevent;
+static gboolean
+forward_event (GstPad * pad, gpointer user_data)
+{
+ struct ForwardEventData *fdata = user_data;
+ GSList *walk = NULL;
+ GstEvent *newevent = NULL;
- newevent = add_ssrc_and_ref (event, dpad->ssrc);
+ GST_OBJECT_LOCK (fdata->demux);
+ for (walk = fdata->demux->srcpads; walk; walk = walk->next) {
+ GstRtpSsrcDemuxPad *dpad = (GstRtpSsrcDemuxPad *) walk->data;
- res &= gst_pad_push_event (dpad->rtp_pad, newevent);
- gst_object_unref (dpad->rtp_pad);
- g_slice_free (GstRtpSsrcDemuxPad, dpad);
- }
- g_slist_free (pads);
- gst_event_unref (event);
+ if (pad == dpad->rtp_pad || pad == dpad->rtcp_pad) {
+ newevent = add_ssrc_and_ref (fdata->event, dpad->ssrc);
break;
}
}
+ GST_OBJECT_UNLOCK (fdata->demux);
- return res;
+ if (newevent)
+ fdata->res &= gst_pad_push_event (pad, newevent);
+
+ return FALSE;
}
+
static gboolean
-gst_rtp_ssrc_demux_rtcp_sink_event (GstPad * pad, GstObject * parent,
+gst_rtp_ssrc_demux_sink_event (GstPad * pad, GstObject * parent,
GstEvent * event)
{
GstRtpSsrcDemux *demux;
- gboolean res = TRUE;
- GSList *walk;
- GSList *pads = NULL;
+ struct ForwardEventData fdata;
demux = GST_RTP_SSRC_DEMUX (parent);
- GST_PAD_LOCK (demux);
- for (walk = demux->srcpads; walk; walk = g_slist_next (walk)) {
- GstRtpSsrcDemuxPad *pad = (GstRtpSsrcDemuxPad *) walk->data;
-
- pad = g_slice_dup (GstRtpSsrcDemuxPad, pad);
- gst_object_ref (pad->rtcp_pad);
-
- pads = g_slist_prepend (pads, pad);
- }
- GST_PAD_UNLOCK (demux);
-
- for (walk = pads; walk; walk = g_slist_next (walk)) {
- GstRtpSsrcDemuxPad *dpad = walk->data;
- GstEvent *newevent;
+ fdata.demux = demux;
+ fdata.pad = pad;
+ fdata.event = event;
+ fdata.res = TRUE;
- newevent = add_ssrc_and_ref (event, dpad->ssrc);
+ gst_pad_forward (pad, forward_event, &fdata);
- res &= gst_pad_push_event (dpad->rtcp_pad, newevent);
- gst_object_unref (dpad->rtcp_pad);
- g_slice_free (GstRtpSsrcDemuxPad, dpad);
- }
- g_slist_free (pads);
gst_event_unref (event);
- return res;
+ return fdata.res;
}
static GstFlowReturn
guint32 ssrc;
GstRTPBuffer rtp = { NULL };
GstPad *srcpad;
- GstRtpSsrcDemuxPad *dpad;
demux = GST_RTP_SSRC_DEMUX (parent);
ret = gst_pad_push (srcpad, buf);
if (ret != GST_FLOW_OK) {
+ GstPad *active_pad;
+
/* check if the ssrc still there, may have been removed */
- GST_PAD_LOCK (demux);
- dpad = find_demux_pad_for_ssrc (demux, ssrc);
- if (dpad == NULL || dpad->rtp_pad != srcpad) {
+ active_pad = get_demux_pad_for_ssrc (demux, ssrc, RTP_PAD);
+
+ if (active_pad == NULL || active_pad != srcpad) {
/* SSRC was removed during the push ... ignore the error */
ret = GST_FLOW_OK;
}
- GST_PAD_UNLOCK (demux);
+
+ g_clear_object (&active_pad);
}
gst_object_unref (srcpad);
/* ERRORS */
invalid_payload:
{
- /* this is fatal and should be filtered earlier */
- GST_ELEMENT_ERROR (demux, STREAM, DECODE, (NULL),
- ("Dropping invalid RTP payload"));
+ GST_DEBUG_OBJECT (demux, "Dropping invalid RTP packet");
gst_buffer_unref (buf);
- return GST_FLOW_ERROR;
+ return GST_FLOW_OK;
}
create_failed:
{
- GST_ELEMENT_ERROR (demux, STREAM, DECODE, (NULL),
- ("Could not create new pad"));
gst_buffer_unref (buf);
- return GST_FLOW_ERROR;
+ GST_WARNING_OBJECT (demux,
+ "Dropping buffer SSRC %08x. "
+ "Max streams number reached (%u)", ssrc, demux->max_streams);
+ return GST_FLOW_OK;
}
}
GstRTCPPacket packet;
GstRTCPBuffer rtcp = { NULL, };
GstPad *srcpad;
- GstRtpSsrcDemuxPad *dpad;
demux = GST_RTP_SSRC_DEMUX (parent);
- if (!gst_rtcp_buffer_validate (buf))
+ if (!gst_rtcp_buffer_validate_reduced (buf))
goto invalid_rtcp;
gst_rtcp_buffer_map (buf, GST_MAP_READ, &rtcp);
goto invalid_rtcp;
}
- /* first packet must be SR or RR or else the validate would have failed */
+ /* first packet must be SR or RR, or in case of a reduced size RTCP packet
+ * it must be APP, RTPFB or PSFB feeadback, or else the validate would
+ * have failed */
switch (gst_rtcp_packet_get_type (&packet)) {
case GST_RTCP_TYPE_SR:
/* get the ssrc so that we can route it to the right source pad */
gst_rtcp_packet_sr_get_sender_info (&packet, &ssrc, NULL, NULL, NULL,
NULL);
break;
+ case GST_RTCP_TYPE_RR:
+ ssrc = gst_rtcp_packet_rr_get_ssrc (&packet);
+ break;
+ case GST_RTCP_TYPE_APP:
+ ssrc = gst_rtcp_packet_app_get_ssrc (&packet);
+ break;
+ case GST_RTCP_TYPE_RTPFB:
+ case GST_RTCP_TYPE_PSFB:
+ ssrc = gst_rtcp_packet_fb_get_sender_ssrc (&packet);
+ break;
default:
goto unexpected_rtcp;
}
ret = gst_pad_push (srcpad, buf);
if (ret != GST_FLOW_OK) {
+ GstPad *active_pad;
+
/* check if the ssrc still there, may have been removed */
- GST_PAD_LOCK (demux);
- dpad = find_demux_pad_for_ssrc (demux, ssrc);
- if (dpad == NULL || dpad->rtcp_pad != srcpad) {
+ active_pad = get_demux_pad_for_ssrc (demux, ssrc, RTCP_PAD);
+ if (active_pad == NULL || active_pad != srcpad) {
/* SSRC was removed during the push ... ignore the error */
ret = GST_FLOW_OK;
}
- GST_PAD_UNLOCK (demux);
+
+ g_clear_object (&active_pad);
}
gst_object_unref (srcpad);
/* ERRORS */
invalid_rtcp:
{
- /* this is fatal and should be filtered earlier */
- GST_ELEMENT_ERROR (demux, STREAM, DECODE, (NULL),
- ("Dropping invalid RTCP packet"));
+ GST_DEBUG_OBJECT (demux, "Dropping invalid RTCP packet");
gst_buffer_unref (buf);
- return GST_FLOW_ERROR;
+ return GST_FLOW_OK;
}
unexpected_rtcp:
{
}
create_failed:
{
- GST_ELEMENT_ERROR (demux, STREAM, DECODE, (NULL),
- ("Could not create new pad"));
gst_buffer_unref (buf);
- return GST_FLOW_ERROR;
+ GST_WARNING_OBJECT (demux,
+ "Dropping buffer SSRC %08x. "
+ "Max streams number reached (%u)", ssrc, demux->max_streams);
+ return GST_FLOW_OK;
}
}
demux = GST_RTP_SSRC_DEMUX (parent);
- GST_PAD_LOCK (demux);
+ GST_OBJECT_LOCK (demux);
for (current = demux->srcpads; current; current = g_slist_next (current)) {
GstRtpSsrcDemuxPad *dpad = (GstRtpSsrcDemuxPad *) current->data;
g_value_unset (&val);
}
- GST_PAD_UNLOCK (demux);
+ GST_OBJECT_UNLOCK (demux);
return it;
}
{
GstPad *pad = GST_PAD (g_value_get_object (a));
const gchar *prefix = g_value_get_string (b);
- gint res = 1;
+ gint res;
+ /* 0 means equal means we accept the pad, accepted if there is a name
+ * and it starts with the prefix */
GST_OBJECT_LOCK (pad);
- res = !GST_PAD_NAME (pad) || g_str_has_prefix (GST_PAD_NAME (pad), prefix);
+ res = !GST_PAD_NAME (pad) || !g_str_has_prefix (GST_PAD_NAME (pad), prefix);
GST_OBJECT_UNLOCK (pad);
return res;
projects / platform / upstream / gst-plugins-good.git / blobdiff