summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2010-02-10 14:40:17 +0100
committerEdward Hervey <bilboed@bilboed.com>2010-02-10 14:40:17 +0100
commit5a0cdc700159582ad904272bd4daa2d31a36422c (patch)
tree06d3019ccb993c886f936c51b16ac528772a21c5
parent4e0b2dc8321138940caaa4efcb104795f060482a (diff)
tests: Fix multiqueue test for latest commits.
The problem lies in the fact that multiqueue will now operate somewhat similarly to the flow aggregation logic of demuxers and therefore will stopp whenever all downstream pads return NOT_LINKED and/or UNEXPECTED and there's no more buffers to push. The latest commits should not affect any regular use-case, but the bug report will be kept open so the previous behaviour can be re-established if needed. Fixes #609486
-rw-r--r--tests/check/elements/multiqueue.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/check/elements/multiqueue.c b/tests/check/elements/multiqueue.c
index 1c7a418d1b..b9f5ce6fa3 100644
--- a/tests/check/elements/multiqueue.c
+++ b/tests/check/elements/multiqueue.c
@@ -479,13 +479,14 @@ run_output_order_test (gint n_linked)
/* Wait while the buffers are processed */
g_mutex_lock (mutex);
- while (eos_seen < 5) {
+ /* We wait until EOS has been pushed on all linked pads */
+ while (eos_seen < n_linked) {
g_cond_wait (cond, mutex);
}
g_mutex_unlock (mutex);
/* Clean up */
- for (i = 0; i < 5; i++) {
+ for (i = 0; i < NPADS; i++) {
GstPad *mq_input = gst_pad_get_peer (inputpads[i]);
gst_pad_unlink (inputpads[i], mq_input);