mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-13 02:45:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "multiqueue: handle UNEXPECTED flowreturn better"

Browse source 
This reverts commit fbdf4dceda.

Partly fixes #609274
This commit is contained in:
Edward Hervey 2010-02-09 13:35:08 +01:00
parent 795495519a
commit 9cc47f8cba
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/elements/gstmultiqueue.c
View file

@ -917,13 +917,6 @@ gst_single_queue_push_one (GstMultiQueue * mq, GstSingleQueue * sq,
gst_pad_set_caps (sq->srcpad, caps); gst_pad_set_caps (sq->srcpad, caps);
result = gst_pad_push (sq->srcpad, buffer); 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)) { } else if (GST_IS_EVENT (object)) {
GstEvent *event; GstEvent *event;

4
tests/check/elements/multiqueue.c
View file

@ -479,13 +479,13 @@ run_output_order_test (gint n_linked)
/* Wait while the buffers are processed */ /* Wait while the buffers are processed */
g_mutex_lock (mutex); g_mutex_lock (mutex);
while (eos_seen < NPADS) { while (eos_seen < 5) {
g_cond_wait (cond, mutex); g_cond_wait (cond, mutex);
} }
g_mutex_unlock (mutex); g_mutex_unlock (mutex);
/* Clean up */ /* Clean up */
for (i = 0; i < NPADS; i++) { for (i = 0; i < 5; i++) {
GstPad *mq_input = gst_pad_get_peer (inputpads[i]); GstPad *mq_input = gst_pad_get_peer (inputpads[i]);
gst_pad_unlink (inputpads[i], mq_input); gst_pad_unlink (inputpads[i], mq_input);