mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

jitterbuffer: refactor timeout triggers

Browse source
This commit is contained in:
Wim Taymans 2013-09-17 23:21:09 +02:00
parent 047021c443
commit f49981a597
1 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -2220,7 +2220,7 @@ wait:
} }
/* the timeout for when we expected a packet expired */ /* the timeout for when we expected a packet expired */
static void static gboolean
do_expected_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer, do_expected_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GstClockTime now) GstClockTime now)
{ {
@ -2254,10 +2254,12 @@ do_expected_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
} }
reschedule_timer (jitterbuffer, timer, timer->seqnum, reschedule_timer (jitterbuffer, timer, timer->seqnum,
timer->rtx_base + timer->rtx_retry); timer->rtx_base + timer->rtx_retry);
return FALSE;
} }
/* a packet is lost */ /* a packet is lost */
static void static gboolean
do_lost_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer, do_lost_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GstClockTime now) GstClockTime now)
{ {
@ -2326,9 +2328,10 @@ do_lost_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
gst_pad_push_event (priv->srcpad, event); gst_pad_push_event (priv->srcpad, event);
JBUF_LOCK (priv); JBUF_LOCK (priv);
} }
return TRUE;
} }
static void static gboolean
do_eos_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer, do_eos_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GstClockTime now) GstClockTime now)
{ {
@ -2337,9 +2340,11 @@ do_eos_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GST_INFO_OBJECT (jitterbuffer, "got the NPT timeout"); GST_INFO_OBJECT (jitterbuffer, "got the NPT timeout");
remove_timer (jitterbuffer, timer); remove_timer (jitterbuffer, timer);
JBUF_SIGNAL_EVENT (priv); JBUF_SIGNAL_EVENT (priv);
return TRUE;
} }
static void static gboolean
do_deadline_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer, do_deadline_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GstClockTime now) GstClockTime now)
{ {
@ -2350,6 +2355,31 @@ do_deadline_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
priv->next_seqnum = timer->seqnum; priv->next_seqnum = timer->seqnum;
remove_timer (jitterbuffer, timer); remove_timer (jitterbuffer, timer);
JBUF_SIGNAL_EVENT (priv); JBUF_SIGNAL_EVENT (priv);
return TRUE;
}
static gboolean
do_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GstClockTime now)
{
gboolean removed = FALSE;
switch (timer->type) {
case TIMER_TYPE_EXPECTED:
removed = do_expected_timeout (jitterbuffer, timer, now);
break;
case TIMER_TYPE_LOST:
removed = do_lost_timeout (jitterbuffer, timer, now);
break;
case TIMER_TYPE_DEADLINE:
removed = do_deadline_timeout (jitterbuffer, timer, now);
break;
case TIMER_TYPE_EOS:
removed = do_eos_timeout (jitterbuffer, timer, now);
break;
}
return removed;
} }
/* called when we need to wait for the next timeout. /* called when we need to wait for the next timeout.
@ -2384,25 +2414,9 @@ wait_next_timeout (GstRtpJitterBuffer * jitterbuffer)
/* no timestamp, timeout immeditately */ /* no timestamp, timeout immeditately */
if (test_timeout == -1 || test_timeout <= now) { if (test_timeout == -1 || test_timeout <= now) {
switch (test->type) { if (do_timeout (jitterbuffer, test, now)) {
case TIMER_TYPE_EXPECTED: i--;
do_expected_timeout (jitterbuffer, test, now); len--;
break;
case TIMER_TYPE_LOST:
do_lost_timeout (jitterbuffer, test, now);
i--;
len--;
break;
case TIMER_TYPE_DEADLINE:
do_deadline_timeout (jitterbuffer, test, now);
i--;
len--;
break;
case TIMER_TYPE_EOS:
do_eos_timeout (jitterbuffer, test, now);
i--;
len--;
break;
} }
} else { } else {
/* find the smallest timeout */ /* find the smallest timeout */