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

rtpjitterbuffer: Unlock timer waits on flushing

Browse source 
If there is a pending EOS wait for example, we would never unblock on flushing

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3401>
This commit is contained in:
Edward Hervey 2022-11-13 08:38:25 +01:00 committed by GStreamer Marge Bot
parent 9dc787755d
commit 30886fa9ea
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
subprojects/gst-plugins-good/gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -232,6 +232,13 @@ enum
(priv)->waiting_timer--; \ (priv)->waiting_timer--; \
GST_DEBUG ("waiting timer done"); \ GST_DEBUG ("waiting timer done"); \
} G_STMT_END } G_STMT_END
#define JBUF_WAIT_TIMER_CHECK(priv, label) G_STMT_START { \
if (G_UNLIKELY (priv->srcresult != GST_FLOW_OK)) \
goto label; \
JBUF_WAIT_TIMER (priv); \
if (G_UNLIKELY (priv->srcresult != GST_FLOW_OK)) \
goto label; \
} G_STMT_END
#define JBUF_SIGNAL_TIMER(priv) G_STMT_START { \ #define JBUF_SIGNAL_TIMER(priv) G_STMT_START { \
if (G_UNLIKELY ((priv)->waiting_timer)) { \ if (G_UNLIKELY ((priv)->waiting_timer)) { \
GST_DEBUG ("signal timer, %d waiters", (priv)->waiting_timer); \ GST_DEBUG ("signal timer, %d waiters", (priv)->waiting_timer); \
@ -1704,6 +1711,7 @@ gst_rtp_jitter_buffer_flush_start (GstRtpJitterBuffer * jitterbuffer)
JBUF_SIGNAL_EVENT (priv); JBUF_SIGNAL_EVENT (priv);
JBUF_SIGNAL_QUERY (priv, FALSE); JBUF_SIGNAL_QUERY (priv, FALSE);
JBUF_SIGNAL_QUEUE (priv); JBUF_SIGNAL_QUEUE (priv);
JBUF_SIGNAL_TIMER (priv);
JBUF_UNLOCK (priv); JBUF_UNLOCK (priv);
} }
@ -3851,7 +3859,7 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum)
while (rtp_timer_queue_length (priv->timers) > 0) { while (rtp_timer_queue_length (priv->timers) > 0) {
/* Stopping timers */ /* Stopping timers */
unschedule_current_timer (jitterbuffer); unschedule_current_timer (jitterbuffer);
JBUF_WAIT_TIMER (priv); JBUF_WAIT_TIMER_CHECK (priv, out_flushing_wait);
} }
} }
@ -3918,6 +3926,12 @@ out_flushing:
{ {
return priv->srcresult; return priv->srcresult;
} }
out_flushing_wait:
{
rtp_jitter_buffer_free_item (item);
return priv->srcresult;
}
} }
#define GST_FLOW_WAIT GST_FLOW_CUSTOM_SUCCESS #define GST_FLOW_WAIT GST_FLOW_CUSTOM_SUCCESS