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/gstrtpjitterbuffer.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/gstrtpjitterbuffer.c')
-rw-r--r-- | gst/rtpmanager/gstrtpjitterbuffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index 57be42ec..d27c2aa1 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -797,6 +797,7 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstBuffer * buffer) guint16 seqnum; GstFlowReturn ret = GST_FLOW_OK; GstClockTime timestamp; + guint64 latency_ts; jitterbuffer = GST_RTP_JITTER_BUFFER (gst_pad_get_parent (pad)); @@ -849,7 +850,6 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstBuffer * buffer) * latency is set, we just pump it in the queue and let the other end push it * out as fast as possible. */ if (priv->latency_ms && priv->drop_on_latency) { - guint64 latency_ts; latency_ts = gst_util_uint64_scale_int (priv->latency_ms, priv->clock_rate, 1000); @@ -1053,8 +1053,8 @@ again: if (priv->next_seqnum != -1) { /* we expected next_seqnum but received something else, that's a gap */ GST_WARNING_OBJECT (jitterbuffer, - "Sequence number GAP detected -> %d instead of %d", priv->next_seqnum, - seqnum); + "Sequence number GAP detected: expected %d instead of %d", + priv->next_seqnum, seqnum); } else { /* we don't know what the next_seqnum should be, wait for the last * possible moment to push this buffer, maybe we get an earlier seqnum |