mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 02:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

jitterbuffer: small cleanups

Browse source
This commit is contained in:
Wim Taymans 2013-08-19 21:29:49 +02:00
parent b4a35bbe82
commit 652ce95ca6
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -165,7 +165,7 @@ struct _GstRtpJitterBufferPrivate
GstClockTime last_out_pts; GstClockTime last_out_pts;
/* last valid input timestamp and rtptime pair */ /* last valid input timestamp and rtptime pair */
GstClockTime ips_dts; GstClockTime ips_dts;
GstClockTime ips_rtptime; guint64 ips_rtptime;
GstClockTime packet_spacing; GstClockTime packet_spacing;
/* the next expected seqnum we receive */ /* the next expected seqnum we receive */
guint32 next_in_seqnum; guint32 next_in_seqnum;
@ -1642,7 +1642,7 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstObject * parent,
GstRtpJitterBuffer *jitterbuffer; GstRtpJitterBuffer *jitterbuffer;
GstRtpJitterBufferPrivate *priv; GstRtpJitterBufferPrivate *priv;
guint16 seqnum; guint16 seqnum;
guint32 rtptime; guint32 expected, rtptime;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GstClockTime dts, pts; GstClockTime dts, pts;
guint64 latency_ts; guint64 latency_ts;
@ -1674,7 +1674,7 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstObject * parent,
/* take the DTS of the buffer. This is the time when the packet was /* take the DTS of the buffer. This is the time when the packet was
* received and is used to calculate jitter and clock skew. We will adjust * received and is used to calculate jitter and clock skew. We will adjust
* this PTS with the smoothed value after processing it in the * this DTS with the smoothed value after processing it in the
* jitterbuffer and assign it as the PTS. */ * jitterbuffer and assign it as the PTS. */
/* bring to running time */ /* bring to running time */
dts = gst_segment_to_running_time (&priv->segment, GST_FORMAT_TIME, dts); dts = gst_segment_to_running_time (&priv->segment, GST_FORMAT_TIME, dts);
@ -1717,23 +1717,25 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstObject * parent,
if (G_UNLIKELY (priv->eos)) if (G_UNLIKELY (priv->eos))
goto have_eos; goto have_eos;
expected = priv->next_in_seqnum;
/* now check against our expected seqnum */ /* now check against our expected seqnum */
if (G_LIKELY (priv->next_in_seqnum != -1)) { if (G_LIKELY (expected != -1)) {
gint gap; gint gap;
gap = gst_rtp_buffer_compare_seqnum (priv->next_in_seqnum, seqnum); gap = gst_rtp_buffer_compare_seqnum (expected, seqnum);
if (G_UNLIKELY (gap != 0)) { if (G_UNLIKELY (gap != 0)) {
gboolean reset = FALSE; gboolean reset = FALSE;
GST_DEBUG_OBJECT (jitterbuffer, "expected #%d, got #%d, gap of %d", GST_DEBUG_OBJECT (jitterbuffer, "expected #%d, got #%d, gap of %d",
priv->next_in_seqnum, seqnum, gap); expected, seqnum, gap);
/* priv->next_in_seqnum >= seqnum, this packet is too late or the /* expected >= seqnum, this packet is too late or the
* sender might have been restarted with different seqnum. */ * sender might have been restarted with different seqnum. */
if (gap < -RTP_MAX_MISORDER) { if (gap < -RTP_MAX_MISORDER) {
GST_DEBUG_OBJECT (jitterbuffer, "reset: buffer too old %d", gap); GST_DEBUG_OBJECT (jitterbuffer, "reset: buffer too old %d", gap);
reset = TRUE; reset = TRUE;
} }
/* priv->next_in_seqnum < seqnum, this is a new packet */ /* expected < seqnum, this is a new packet */
else if (G_UNLIKELY (gap > RTP_MAX_DROPOUT)) { else if (G_UNLIKELY (gap > RTP_MAX_DROPOUT)) {
GST_DEBUG_OBJECT (jitterbuffer, "reset: too many dropped packets %d", GST_DEBUG_OBJECT (jitterbuffer, "reset: too many dropped packets %d",
gap); gap);
@ -1754,7 +1756,7 @@ gst_rtp_jitter_buffer_chain (GstPad * pad, GstObject * parent,
} }
/* reset spacing estimation when gap */ /* reset spacing estimation when gap */
priv->ips_rtptime = -1; priv->ips_rtptime = -1;
priv->ips_dts = -1; priv->ips_dts = GST_CLOCK_TIME_NONE;
} else { } else {
/* packet is expected, we need consecutive seqnums with a different /* packet is expected, we need consecutive seqnums with a different
* rtptime to estimate the packet spacing. */ * rtptime to estimate the packet spacing. */
@ -2379,9 +2381,11 @@ wait_next_timeout (GstRtpJitterBuffer * jitterbuffer)
/* at this point, the clock could have been unlocked by a timeout, a new /* at this point, the clock could have been unlocked by a timeout, a new
* tail element was added to the queue or because we are shutting down. Check * tail element was added to the queue or because we are shutting down. Check
* for shutdown first. */ * for shutdown first. */
if G_UNLIKELY if (G_UNLIKELY (priv->srcresult != GST_FLOW_OK))
((priv->srcresult != GST_FLOW_OK)) goto flushing;
goto flushing;
if (priv->timers->len <= timer_idx)
goto done;
/* we released the lock, the array might have changed */ /* we released the lock, the array might have changed */
timer = &g_array_index (priv->timers, TimerData, timer_idx); timer = &g_array_index (priv->timers, TimerData, timer_idx);