mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue: Remove useless checks from e406f7

Browse source 
srcresult was being rechecked in places it couldn't have changed.
queue level was being rechecked in places it couldn't have changed.

https://bugzilla.gnome.org/show_bug.cgi?id=632780
This commit is contained in:
Edward Hervey 2010-10-19 15:53:26 +02:00
parent 7cc08390b9
commit 0c2086a475
1 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
plugins/elements/gstqueue.c
View file

@ -963,15 +963,11 @@ gst_queue_chain (GstPad * pad, GstBuffer * buffer)
GST_QUEUE_MUTEX_UNLOCK (queue); GST_QUEUE_MUTEX_UNLOCK (queue);
g_signal_emit (queue, gst_queue_signals[SIGNAL_OVERRUN], 0); g_signal_emit (queue, gst_queue_signals[SIGNAL_OVERRUN], 0);
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
} else { /* we recheck, the signal could have changed the thresholds */
if (queue->srcresult != GST_FLOW_OK) if (!gst_queue_is_filled (queue))
goto out_flushing; break;
} }
/* we recheck, the signal could have changed the thresholds */
if (!gst_queue_is_filled (queue))
break;
/* how are we going to make space for this buffer? */ /* how are we going to make space for this buffer? */
switch (queue->leaky) { switch (queue->leaky) {
case GST_QUEUE_LEAK_UPSTREAM: case GST_QUEUE_LEAK_UPSTREAM:
@ -1005,9 +1001,6 @@ gst_queue_chain (GstPad * pad, GstBuffer * buffer)
GST_QUEUE_MUTEX_UNLOCK (queue); GST_QUEUE_MUTEX_UNLOCK (queue);
g_signal_emit (queue, gst_queue_signals[SIGNAL_RUNNING], 0); g_signal_emit (queue, gst_queue_signals[SIGNAL_RUNNING], 0);
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
} else {
if (queue->srcresult != GST_FLOW_OK)
goto out_flushing;
} }
break; break;
} }
@ -1228,15 +1221,11 @@ gst_queue_loop (GstPad * pad)
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
while (gst_queue_is_empty (queue)) { while (gst_queue_is_empty (queue)) {
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is empty");
if (!queue->silent) { if (!queue->silent) {
GST_QUEUE_MUTEX_UNLOCK (queue); GST_QUEUE_MUTEX_UNLOCK (queue);
g_signal_emit (queue, gst_queue_signals[SIGNAL_UNDERRUN], 0); g_signal_emit (queue, gst_queue_signals[SIGNAL_UNDERRUN], 0);
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is empty");
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
} else {
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is empty");
if (queue->srcresult != GST_FLOW_OK)
goto out_flushing;
} }
/* we recheck, the signal could have changed the thresholds */ /* we recheck, the signal could have changed the thresholds */
@ -1244,16 +1233,12 @@ gst_queue_loop (GstPad * pad)
GST_QUEUE_WAIT_ADD_CHECK (queue, out_flushing); GST_QUEUE_WAIT_ADD_CHECK (queue, out_flushing);
} }
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is not empty");
if (!queue->silent) { if (!queue->silent) {
GST_QUEUE_MUTEX_UNLOCK (queue); GST_QUEUE_MUTEX_UNLOCK (queue);
g_signal_emit (queue, gst_queue_signals[SIGNAL_RUNNING], 0); g_signal_emit (queue, gst_queue_signals[SIGNAL_RUNNING], 0);
g_signal_emit (queue, gst_queue_signals[SIGNAL_PUSHING], 0); g_signal_emit (queue, gst_queue_signals[SIGNAL_PUSHING], 0);
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is not empty");
GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing); GST_QUEUE_MUTEX_LOCK_CHECK (queue, out_flushing);
} else {
GST_CAT_DEBUG_OBJECT (queue_dataflow, queue, "queue is not empty");
if (queue->srcresult != GST_FLOW_OK)
goto out_flushing;
} }
} }