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

Merge remote-tracking branch 'origin/0.10'

Browse source
This commit is contained in:
Sebastian Dröge 2012-04-09 16:42:30 +02:00
commit 1a61f3ec19
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/elements/gstmultiqueue.c
View file

@ -1177,6 +1177,7 @@ gst_multi_queue_loop (GstPad * pad)
guint32 newid; guint32 newid;
GstFlowReturn result; GstFlowReturn result;
GstClockTime next_time; GstClockTime next_time;
gboolean is_buffer;
sq = (GstSingleQueue *) gst_pad_get_element_private (pad); sq = (GstSingleQueue *) gst_pad_get_element_private (pad);
mq = sq->mqueue; mq = sq->mqueue;
@ -1198,6 +1199,8 @@ gst_multi_queue_loop (GstPad * pad)
object = gst_multi_queue_item_steal_object (item); object = gst_multi_queue_item_steal_object (item);
gst_multi_queue_item_destroy (item); gst_multi_queue_item_destroy (item);
is_buffer = GST_IS_BUFFER (object);
/* Get running time of the item. Events will have GST_CLOCK_TIME_NONE */ /* Get running time of the item. Events will have GST_CLOCK_TIME_NONE */
next_time = get_running_time (&sq->src_segment, object, TRUE); next_time = get_running_time (&sq->src_segment, object, TRUE);
@ -1307,6 +1310,7 @@ gst_multi_queue_loop (GstPad * pad)
/* Try to push out the new object */ /* Try to push out the new object */
result = gst_single_queue_push_one (mq, sq, object); result = gst_single_queue_push_one (mq, sq, object);
object = NULL;
/* Check if we pushed something already and if this is /* Check if we pushed something already and if this is
* now a switch from an active to a non-active stream. * now a switch from an active to a non-active stream.
@ -1342,14 +1346,12 @@ gst_multi_queue_loop (GstPad * pad)
} }
} }
if (GST_IS_BUFFER (object)) if (is_buffer)
sq->pushed = TRUE; sq->pushed = TRUE;
sq->srcresult = result; sq->srcresult = result;
sq->last_oldid = newid; sq->last_oldid = newid;
GST_MULTI_QUEUE_MUTEX_UNLOCK (mq); GST_MULTI_QUEUE_MUTEX_UNLOCK (mq);
object = NULL;
if (result != GST_FLOW_OK && result != GST_FLOW_NOT_LINKED if (result != GST_FLOW_OK && result != GST_FLOW_NOT_LINKED
&& result != GST_FLOW_EOS) && result != GST_FLOW_EOS)
goto out_flushing; goto out_flushing;