mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

jitterbuffer: improve timeout management

Browse source 
If we change the seqnum of an existing timer and we were waiting for
that timer, unschedule it. If we change the timeout of an existing timer and we
were waiting on it, only unschedule when the new time is smaller.
This commit is contained in:
Wim Taymans 2013-08-01 15:40:52 +02:00
parent 77e5d320ab
commit f3c658cbe6
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -184,6 +184,7 @@ struct _GstRtpJitterBufferPrivate
GstSegment segment; GstSegment segment;
GstClockID clock_id; GstClockID clock_id;
GstClockTime timer_timeout; GstClockTime timer_timeout;
guint16 timer_seqnum;
gboolean unscheduled; gboolean unscheduled;
/* the latency of the upstream peer, we have to take this into account when /* the latency of the upstream peer, we have to take this into account when
* synchronizing the buffers. */ * synchronizing the buffers. */
@ -1345,9 +1346,18 @@ static void
reschedule_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer, reschedule_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
guint16 seqnum, GstClockTime timeout) guint16 seqnum, GstClockTime timeout)
{ {
if (timer->seqnum == seqnum && timer->timeout == timeout) GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;
gboolean seqchange, timechange;
guint16 oldseq;
seqchange = timer->seqnum != seqnum;
timechange = timer->timeout != timeout;
if (!seqchange && timechange)
return; return;
oldseq = timer->seqnum;
GST_DEBUG_OBJECT (jitterbuffer, GST_DEBUG_OBJECT (jitterbuffer,
"replace timer for seqnum %d->%d to %" GST_TIME_FORMAT, "replace timer for seqnum %d->%d to %" GST_TIME_FORMAT,
timer->seqnum, seqnum, GST_TIME_ARGS (timeout)); timer->seqnum, seqnum, GST_TIME_ARGS (timeout));
@ -1355,7 +1365,12 @@ reschedule_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
timer->timeout = timeout; timer->timeout = timeout;
timer->seqnum = seqnum; timer->seqnum = seqnum;
recalculate_timer (jitterbuffer, timer); if (priv->clock_id) {
if (seqchange && priv->timer_seqnum == oldseq)
unschedule_current_timer (jitterbuffer);
else if (timechange)
recalculate_timer (jitterbuffer, timer);
}
} }
static TimerData * static TimerData *
@ -2122,6 +2137,7 @@ wait_next_timeout (GstRtpJitterBuffer * jitterbuffer)
id = priv->clock_id = gst_clock_new_single_shot_id (clock, sync_time); id = priv->clock_id = gst_clock_new_single_shot_id (clock, sync_time);
priv->unscheduled = FALSE; priv->unscheduled = FALSE;
priv->timer_timeout = timer_timeout; priv->timer_timeout = timer_timeout;
priv->timer_seqnum = timer->seqnum;
timer_idx = timer->idx; timer_idx = timer->idx;
GST_OBJECT_UNLOCK (jitterbuffer); GST_OBJECT_UNLOCK (jitterbuffer);