mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpjitterbuffer: add option to reset retransmission timers

Browse source
This commit is contained in:
Wim Taymans 2013-09-20 12:27:26 +02:00
parent 6f4deab298
commit 3c421e7e48
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -1520,7 +1520,7 @@ add_timer (GstRtpJitterBuffer * jitterbuffer, TimerType type,
static void static void
reschedule_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer, reschedule_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
guint16 seqnum, GstClockTime timeout, GstClockTime delay) guint16 seqnum, GstClockTime timeout, GstClockTime delay, gboolean reset)
{ {
GstRtpJitterBufferPrivate *priv = jitterbuffer->priv; GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;
gboolean seqchange, timechange; gboolean seqchange, timechange;
@ -1540,7 +1540,7 @@ reschedule_timer (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
timer->timeout = timeout + delay; timer->timeout = timeout + delay;
timer->seqnum = seqnum; timer->seqnum = seqnum;
if (seqchange && timer->type == TIMER_TYPE_EXPECTED) { if (reset) {
timer->rtx_base = timeout; timer->rtx_base = timeout;
timer->rtx_delay = delay; timer->rtx_delay = delay;
timer->rtx_retry = 0; timer->rtx_retry = 0;
@ -1569,7 +1569,7 @@ set_timer (GstRtpJitterBuffer * jitterbuffer, TimerType type,
if (timer == NULL) { if (timer == NULL) {
timer = add_timer (jitterbuffer, type, seqnum, 0, timeout, 0, -1); timer = add_timer (jitterbuffer, type, seqnum, 0, timeout, 0, -1);
} else { } else {
reschedule_timer (jitterbuffer, timer, seqnum, timeout, 0); reschedule_timer (jitterbuffer, timer, seqnum, timeout, 0, FALSE);
} }
return timer; return timer;
} }
@ -1636,7 +1636,7 @@ update_timers (GstRtpJitterBuffer * jitterbuffer, guint16 seqnum,
/* max gap, we exceeded the max reorder distance and we don't expect the /* max gap, we exceeded the max reorder distance and we don't expect the
* missing packet to be this reordered */ * missing packet to be this reordered */
if (test->rtx_retry == 0 && test->type == TIMER_TYPE_EXPECTED) if (test->rtx_retry == 0 && test->type == TIMER_TYPE_EXPECTED)
reschedule_timer (jitterbuffer, test, test->seqnum, -1, 0); reschedule_timer (jitterbuffer, test, test->seqnum, -1, 0, FALSE);
} }
} }
@ -1650,7 +1650,7 @@ update_timers (GstRtpJitterBuffer * jitterbuffer, guint16 seqnum,
/* and update/install timer for next seqnum */ /* and update/install timer for next seqnum */
if (timer) if (timer)
reschedule_timer (jitterbuffer, timer, priv->next_in_seqnum, expected, reschedule_timer (jitterbuffer, timer, priv->next_in_seqnum, expected,
delay); delay, TRUE);
else else
add_timer (jitterbuffer, TIMER_TYPE_EXPECTED, priv->next_in_seqnum, 0, add_timer (jitterbuffer, TIMER_TYPE_EXPECTED, priv->next_in_seqnum, 0,
expected, delay, priv->packet_spacing); expected, delay, priv->packet_spacing);
@ -2342,7 +2342,7 @@ do_expected_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
timer->rtx_retry = 0; timer->rtx_retry = 0;
} }
reschedule_timer (jitterbuffer, timer, timer->seqnum, reschedule_timer (jitterbuffer, timer, timer->seqnum,
timer->rtx_base + timer->rtx_retry, timer->rtx_delay); timer->rtx_base + timer->rtx_retry, timer->rtx_delay, FALSE);
return FALSE; return FALSE;
} }