summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2010-02-09 13:35:08 +0100
committerEdward Hervey <bilboed@bilboed.com>2010-02-09 15:58:36 +0100
commit9cc47f8cbaee097818b3a82b23c1d3b5af387b91 (patch)
tree4faf703acea2a95d7b9df3b71972e7aa22b387d0
parent795495519a223d350d6ac55c445b37b488af3268 (diff)
Revert "multiqueue: handle UNEXPECTED flowreturn better"
This reverts commit fbdf4dcedad8692f1e3d8838551188987e462e74. Partly fixes #609274
-rw-r--r--plugins/elements/gstmultiqueue.c7
-rw-r--r--tests/check/elements/multiqueue.c4
2 files changed, 2 insertions, 9 deletions
diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c
index 30f11659cc..0b8439cc1a 100644
--- a/plugins/elements/gstmultiqueue.c
+++ b/plugins/elements/gstmultiqueue.c
@@ -917,13 +917,6 @@ gst_single_queue_push_one (GstMultiQueue * mq, GstSingleQueue * sq,
gst_pad_set_caps (sq->srcpad, caps);
result = gst_pad_push (sq->srcpad, buffer);
-
- if (result == GST_FLOW_UNEXPECTED) {
- GST_LOG_OBJECT (mq, "got UNEXPECTED from downstream");
- /* FIXME, dequeue items until we see EOS or NEWSEGMENT. If the queue is
- * empty, set a flag so that we pass unexpected upstream. */
- result = GST_FLOW_OK;
- }
} else if (GST_IS_EVENT (object)) {
GstEvent *event;
diff --git a/tests/check/elements/multiqueue.c b/tests/check/elements/multiqueue.c
index c956d259f7..1c7a418d1b 100644
--- a/tests/check/elements/multiqueue.c
+++ b/tests/check/elements/multiqueue.c
@@ -479,13 +479,13 @@ run_output_order_test (gint n_linked)
/* Wait while the buffers are processed */
g_mutex_lock (mutex);
- while (eos_seen < NPADS) {
+ while (eos_seen < 5) {
g_cond_wait (cond, mutex);
}
g_mutex_unlock (mutex);
/* Clean up */
- for (i = 0; i < NPADS; i++) {
+ for (i = 0; i < 5; i++) {
GstPad *mq_input = gst_pad_get_peer (inputpads[i]);
gst_pad_unlink (inputpads[i], mq_input);