Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/GStreamer/gstreamer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <jan@centricular.com>2021-09-05 18:43:57 +0300
committerJan Schmidt <jan@centricular.com>2021-09-05 18:43:57 +0300
commit5eba4080710efab965efaf6f9f4ee0487736005a (patch)
treee6154d0ae92ec3e3ec0cd4251ae4745b82441f80
parentc906ccb79fa86dfa9a635e2b14f8ee4754720add (diff)
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/879>
-rw-r--r--plugins/elements/gstmultiqueue.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c
index bc86999c8e..e6231c3997 100644
--- a/plugins/elements/gstmultiqueue.c
+++ b/plugins/elements/gstmultiqueue.c
@@ -1822,6 +1822,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)
@@ -1884,6 +1888,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);
+ }
}
}