diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2007-09-17 02:01:41 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2007-09-17 02:01:41 +0000 |
commit | c0aa28ca5bfc2eaf6b9cbba1159e9490c7c118c4 (patch) | |
tree | 6cbc87e37fd54f7e593a59656ea09358473c391f /gst/rtpmanager/gstrtpbin.c | |
parent | 04d3b8290698e41034809e8baec11622ca128243 (diff) | |
download | gst-plugins-bad-c0aa28ca5bfc2eaf6b9cbba1159e9490c7c118c4.tar.gz gst-plugins-bad-c0aa28ca5bfc2eaf6b9cbba1159e9490c7c118c4.tar.bz2 gst-plugins-bad-c0aa28ca5bfc2eaf6b9cbba1159e9490c7c118c4.zip |
gst/rtpmanager/gstrtpbin.c: Link to the right pads regardless of which one was created first in the ssrc demuxer.
Original commit message from CVS:
* gst/rtpmanager/gstrtpbin.c: (new_ssrc_pad_found):
Link to the right pads regardless of which one was created first in the
ssrc demuxer.
* gst/rtpmanager/gstrtpjitterbuffer.c:
(gst_rtp_jitter_buffer_chain), (gst_rtp_jitter_buffer_loop):
* gst/rtpmanager/gstrtpsession.c: (gst_rtp_session_process_rtp),
(gst_rtp_session_chain_recv_rtp), (gst_rtp_session_chain_send_rtp):
* gst/rtpmanager/rtpsource.c: (calculate_jitter):
Improve debugging.
* gst/rtpmanager/gstrtpssrcdemux.c: (create_demux_pad_for_ssrc),
(gst_rtp_ssrc_demux_init), (gst_rtp_ssrc_demux_finalize),
(gst_rtp_ssrc_demux_sink_event),
(gst_rtp_ssrc_demux_rtcp_sink_event), (gst_rtp_ssrc_demux_chain),
(gst_rtp_ssrc_demux_rtcp_chain),
(gst_rtp_ssrc_demux_internal_links):
* gst/rtpmanager/gstrtpssrcdemux.h:
Fix race in creating the RTP and RTCP pads when a new SSRC is detected.
Diffstat (limited to 'gst/rtpmanager/gstrtpbin.c')
-rw-r--r-- | gst/rtpmanager/gstrtpbin.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gst/rtpmanager/gstrtpbin.c b/gst/rtpmanager/gstrtpbin.c index cdbdaf64..035f4cc9 100644 --- a/gst/rtpmanager/gstrtpbin.c +++ b/gst/rtpmanager/gstrtpbin.c @@ -1404,8 +1404,11 @@ new_ssrc_pad_found (GstElement * element, guint ssrc, GstPad * pad, /* get pad and link */ GST_DEBUG_OBJECT (session->bin, "linking jitterbuffer"); + padname = g_strdup_printf ("src_%d", ssrc); + srcpad = gst_element_get_pad (element, padname); + g_free (padname); sinkpad = gst_element_get_static_pad (stream->buffer, "sink"); - gst_pad_link (pad, sinkpad); + gst_pad_link (srcpad, sinkpad); gst_object_unref (sinkpad); /* get the RTCP sync pad */ @@ -1434,7 +1437,7 @@ new_ssrc_pad_found (GstElement * element, guint ssrc, GstPad * pad, no_stream: { GST_RTP_SESSION_UNLOCK (session); - GST_DEBUG ("could not create stream"); + GST_DEBUG_OBJECT (session->bin, "could not create stream"); return; } } |