From 127e211004c206f0919ffeb6583dafbd6e5ae931 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 22 Oct 2018 15:26:25 +0200 Subject: [PATCH] multiqueue: Don't clamp running times for position calculation Since we use full signed running times, we no longer need to clamp the buffer time. This avoids having the position of single queues not advancing for buffers that are out of segment and never waking up non-linked streams (resulting in an apparent "deadlock"). --- plugins/elements/gstmultiqueue.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index 02875af..76006a2 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -1566,8 +1566,6 @@ get_running_time (GstSegment * segment, GstMiniObject * object, gboolean end) if (GST_CLOCK_TIME_IS_VALID (btime)) { if (end && GST_BUFFER_DURATION_IS_VALID (buf)) btime += GST_BUFFER_DURATION (buf); - if (btime > segment->stop) - btime = segment->stop; time = my_segment_to_running_time (segment, btime); } } else if (GST_IS_BUFFER_LIST (object)) { @@ -1583,8 +1581,6 @@ get_running_time (GstSegment * segment, GstMiniObject * object, gboolean end) if (GST_CLOCK_TIME_IS_VALID (btime)) { if (end && GST_BUFFER_DURATION_IS_VALID (buf)) btime += GST_BUFFER_DURATION (buf); - if (btime > segment->stop) - btime = segment->stop; time = my_segment_to_running_time (segment, btime); if (!end) goto done; -- 2.7.4