summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <edward@centricular.com>2018-10-22 15:26:25 +0200
committerSebastian Dröge <sebastian@centricular.com>2018-11-07 23:09:50 +0200
commit36d19e7e10321ba2fa523d1be187134074a9bb5b (patch)
treef6912565b0b2d14e96947da3edaed5e2ec85c143
parent8e328f571ea8570cdd20077250be1ef9fa8674fa (diff)
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").
-rw-r--r--plugins/elements/gstmultiqueue.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c
index bcf8efa87a..c19191ac8d 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;