diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2009-06-09 13:07:34 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2009-06-09 13:08:54 +0200 |
| commit | 5a77f1827834cf642281166c9bd7a447315c6a42 (patch) | |
| tree | bae8c9d9afd3ce5d32ab3b46550667ec7627b1bf | |
| parent | 6e633cbe33eb1421c2244e9e2f737b695dd8e057 (diff) | |
multiqueue: check byte range even when we have timestamps
As found by thaytan on IRC.
Also check the byte limit, even if we have timestamps because there might just
not be a time limit.
| -rw-r--r-- | plugins/elements/gstmultiqueue.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index 291f136bd9..30f9865329 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -1385,13 +1385,9 @@ single_queue_check_full (GstDataQueue * dataq, guint visible, guint bytes, if (IS_FILLED (visible, visible)) return TRUE; - if (sq->cur_time != 0) { - /* if we have valid time in the queue, check */ - res = IS_FILLED (time, sq->cur_time); - } else { - /* no valid time, check bytes */ - res = IS_FILLED (bytes, bytes); - } + /* check time or bytes */ + res = IS_FILLED (time, sq->cur_time) || IS_FILLED (bytes, bytes); + return res; } |