From f8f5b55ddd367d1a72321ec476deae0e035269dc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 22 Jan 2009 13:33:14 +0100 Subject: Unlock the jitterbuffer before pushing out the packet-lost events. Move some code before we do the unlock to make the jitterbuffer state consistent while we are unlocked. --- gst/rtpmanager/gstrtpjitterbuffer.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gst/rtpmanager/gstrtpjitterbuffer.c') diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index 95cde211..2d3d4458 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -1442,6 +1442,11 @@ again: priv->num_late++; discont = TRUE; + /* update our expected next packet */ + priv->last_popped_seqnum = next_seqnum; + priv->last_out_time = out_time; + priv->next_seqnum = (next_seqnum + 1) & 0xffff; + if (priv->do_lost) { /* create paket lost event */ event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, @@ -1449,13 +1454,11 @@ again: "seqnum", G_TYPE_UINT, (guint) next_seqnum, "timestamp", G_TYPE_UINT64, out_time, "duration", G_TYPE_UINT64, duration, NULL)); + + JBUF_UNLOCK (priv); gst_pad_push_event (priv->srcpad, event); + JBUF_LOCK_CHECK (priv, flushing); } - - /* update our expected next packet */ - priv->last_popped_seqnum = next_seqnum; - priv->last_out_time = out_time; - priv->next_seqnum = (next_seqnum + 1) & 0xffff; /* look for next packet */ goto again; } -- cgit v1.2.1