mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

multiqueue: Ignore queue fullness for most events

Browse source 
Use gst_data_queue_push_force() for most events so they
are immediately enqueued. Only gap events and actual buffer
data will now block when the queue is full.

This fixes a problem with non-flushing seek handling
where events following a segment-done event would block
if they precede the SEGMENT event, since only SEGMENT
events would clear the 'eos' state of the multiqueue
queue.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5954>
This commit is contained in:
Jan Schmidt 2023-12-10 03:25:57 +11:00 committed by GStreamer Marge Bot
parent 8e923a8e2d
commit 533b28cd6a
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
subprojects/gstreamer/plugins/elements/gstmultiqueue.c
View file

@ -2648,6 +2648,7 @@ gst_multi_queue_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
GstEventType type; GstEventType type;
GstEvent *sref = NULL; GstEvent *sref = NULL;
GstPad *srcpad; GstPad *srcpad;
gboolean is_timed_event = FALSE;
sq = GST_MULTIQUEUE_PAD (pad)->sq; sq = GST_MULTIQUEUE_PAD (pad)->sq;
@ -2732,6 +2733,7 @@ gst_multi_queue_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
GST_MULTI_QUEUE_MUTEX_UNLOCK (mq); GST_MULTI_QUEUE_MUTEX_UNLOCK (mq);
} }
} }
is_timed_event = TRUE;
break; break;
default: default:
@ -2755,8 +2757,13 @@ gst_multi_queue_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
"Enqueuing event %p of type %s with id %d", "Enqueuing event %p of type %s with id %d",
event, GST_EVENT_TYPE_NAME (event), curid); event, GST_EVENT_TYPE_NAME (event), curid);
if (!gst_data_queue_push (sq->queue, (GstDataQueueItem *) item)) if (is_timed_event) {
goto flushing; if (!gst_data_queue_push (sq->queue, (GstDataQueueItem *) item))
goto flushing;
} else {
if (!gst_data_queue_push_force (sq->queue, (GstDataQueueItem *) item))
goto flushing;
}
/* mark EOS when we received one, we must do that after putting the /* mark EOS when we received one, we must do that after putting the
* buffer in the queue because EOS marks the buffer as filled. */ * buffer in the queue because EOS marks the buffer as filled. */