mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "rtpjitterbuffer: Avoid deadlock on flush"

Browse source 
This reverts commit 54810bf44f

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/620>
This commit is contained in:
Sebastian Dröge 2020-06-10 13:56:22 +00:00 committed by GStreamer Merge Bot
parent 4419f79aaf
commit f8196e06d5
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -1577,7 +1577,6 @@ gst_rtp_jitter_buffer_flush_start (GstRtpJitterBuffer * jitterbuffer)
JBUF_SIGNAL_EVENT (priv);
JBUF_SIGNAL_QUERY (priv, FALSE);
JBUF_SIGNAL_QUEUE (priv);
JBUF_SIGNAL_TIMER (priv);
JBUF_UNLOCK (priv);
}
@ -3503,8 +3502,6 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum)
/* Stopping timers */
unschedule_current_timer (jitterbuffer);
JBUF_WAIT_TIMER (priv);
if (G_UNLIKELY (priv->srcresult != GST_FLOW_OK))
goto early_out;
}
}
@ -3527,7 +3524,7 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum)
GST_BUFFER_DTS (outbuf) = GST_CLOCK_TIME_NONE;
result = gst_pad_push (priv->srcpad, outbuf);
JBUF_LOCK_CHECK (priv, early_out);
JBUF_LOCK_CHECK (priv, out_flushing);
break;
case ITEM_TYPE_LOST:
case ITEM_TYPE_EVENT:
@ -3549,7 +3546,7 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum)
result = GST_FLOW_OK;
JBUF_LOCK_CHECK (priv, early_out);
JBUF_LOCK_CHECK (priv, out_flushing);
break;
case ITEM_TYPE_QUERY:
{
@ -3557,7 +3554,7 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum)
res = gst_pad_peer_query (priv->srcpad, outquery);
JBUF_LOCK_CHECK (priv, early_out);
JBUF_LOCK_CHECK (priv, out_flushing);
result = GST_FLOW_OK;
GST_LOG_OBJECT (jitterbuffer, "did query %p, return %d", outquery, res);
JBUF_SIGNAL_QUERY (priv, res);
@ -3567,7 +3564,7 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum)
return result;
/* ERRORS */
early_out:
out_flushing:
{
return priv->srcresult;
}