From ac70fb78c4f3eb13a9db3712cf30b86e11b0fb94 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 6 Sep 2021 01:43:57 +1000 Subject: multiqueue: Use running time of gap events for wakeups. Use gap events to update the next_time of a queue the same as buffers or segment events. Fixes problems where a group consisting only of sparse streams primarily driven by gap events would stall with a full multiqueue because unlinked streams in the group were not being woken to push data. Part-of: --- plugins/elements/gstmultiqueue.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index fbb3c693cb..580478d9e7 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -1818,6 +1818,10 @@ apply_gap (GstMultiQueue * mq, GstSingleQueue * sq, GstEvent * event, timestamp += duration; } + GST_DEBUG_OBJECT (mq, "queue %d, %s position updated to %" GST_TIME_FORMAT, + sq->id, segment == &sq->sink_segment ? "sink" : "src", + GST_TIME_ARGS (timestamp)); + segment->position = timestamp; if (segment == &sq->sink_segment) @@ -1880,6 +1884,14 @@ get_running_time (GstSegment * segment, GstMiniObject * object, gboolean end) my_segment_to_running_time ((GstSegment *) new_segment, new_segment->start); } + } else if (GST_EVENT_TYPE (event) == GST_EVENT_GAP) { + GstClockTime ts, dur; + gst_event_parse_gap (event, &ts, &dur); + if (GST_CLOCK_TIME_IS_VALID (ts)) { + if (GST_CLOCK_TIME_IS_VALID (dur)) + ts += dur; + time = my_segment_to_running_time (segment, ts); + } } } -- cgit v1.2.1