mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

queue2: Reduce amount of time locks are taken

Browse source
This commit is contained in:
Edward Hervey 2010-10-19 17:43:56 +02:00
parent ccb9ed2e80
commit 080c965f4f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/elements/gstqueue2.c
View file

@ -1015,6 +1015,8 @@ perform_seek_to_offset (GstQueue2 * queue, guint64 offset)
GstEvent *event; GstEvent *event;
gboolean res; gboolean res;
GST_QUEUE2_MUTEX_UNLOCK (queue);
GST_DEBUG_OBJECT (queue, "Seeking to %" G_GUINT64_FORMAT, offset); GST_DEBUG_OBJECT (queue, "Seeking to %" G_GUINT64_FORMAT, offset);
event = event =
@ -1022,7 +1024,6 @@ perform_seek_to_offset (GstQueue2 * queue, guint64 offset)
GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, GST_SEEK_TYPE_SET, offset, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE, GST_SEEK_TYPE_SET, offset,
GST_SEEK_TYPE_NONE, -1); GST_SEEK_TYPE_NONE, -1);
GST_QUEUE2_MUTEX_UNLOCK (queue);
res = gst_pad_push_event (queue->sinkpad, event); res = gst_pad_push_event (queue->sinkpad, event);
GST_QUEUE2_MUTEX_LOCK (queue); GST_QUEUE2_MUTEX_LOCK (queue);
@ -2197,6 +2198,8 @@ gst_queue2_push_one (GstQueue2 * queue)
goto no_item; goto no_item;
next: next:
GST_QUEUE2_MUTEX_UNLOCK (queue);
if (GST_IS_BUFFER (data)) { if (GST_IS_BUFFER (data)) {
GstBuffer *buffer; GstBuffer *buffer;
GstCaps *caps; GstCaps *caps;
@ -2204,8 +2207,6 @@ next:
buffer = GST_BUFFER_CAST (data); buffer = GST_BUFFER_CAST (data);
caps = GST_BUFFER_CAPS (buffer); caps = GST_BUFFER_CAPS (buffer);
GST_QUEUE2_MUTEX_UNLOCK (queue);
/* set caps before pushing the buffer so that core does not try to do /* set caps before pushing the buffer so that core does not try to do
* something fancy to check if this is possible. */ * something fancy to check if this is possible. */
if (caps && caps != GST_PAD_CAPS (queue->srcpad)) if (caps && caps != GST_PAD_CAPS (queue->srcpad))
@ -2255,17 +2256,16 @@ next:
GstEvent *event = GST_EVENT_CAST (data); GstEvent *event = GST_EVENT_CAST (data);
GstEventType type = GST_EVENT_TYPE (event); GstEventType type = GST_EVENT_TYPE (event);
GST_QUEUE2_MUTEX_UNLOCK (queue);
gst_pad_push_event (queue->srcpad, event); gst_pad_push_event (queue->srcpad, event);
GST_QUEUE2_MUTEX_LOCK_CHECK (queue, queue->srcresult, out_flushing);
/* if we're EOS, return UNEXPECTED so that the task pauses. */ /* if we're EOS, return UNEXPECTED so that the task pauses. */
if (type == GST_EVENT_EOS) { if (type == GST_EVENT_EOS) {
GST_CAT_LOG_OBJECT (queue_dataflow, queue, GST_CAT_LOG_OBJECT (queue_dataflow, queue,
"pushed EOS event %p, return UNEXPECTED", event); "pushed EOS event %p, return UNEXPECTED", event);
result = GST_FLOW_UNEXPECTED; result = GST_FLOW_UNEXPECTED;
} }
GST_QUEUE2_MUTEX_LOCK_CHECK (queue, queue->srcresult, out_flushing);
} }
return result; return result;
@ -2333,9 +2333,9 @@ out_flushing:
GstFlowReturn ret = queue->srcresult; GstFlowReturn ret = queue->srcresult;
gst_pad_pause_task (queue->srcpad); gst_pad_pause_task (queue->srcpad);
GST_QUEUE2_MUTEX_UNLOCK (queue);
GST_CAT_LOG_OBJECT (queue_dataflow, queue, GST_CAT_LOG_OBJECT (queue_dataflow, queue,
"pause task, reason: %s", gst_flow_get_name (queue->srcresult)); "pause task, reason: %s", gst_flow_get_name (queue->srcresult));
GST_QUEUE2_MUTEX_UNLOCK (queue);
/* let app know about us giving up if upstream is not expected to do so */ /* let app know about us giving up if upstream is not expected to do so */
/* UNEXPECTED is already taken care of elsewhere */ /* UNEXPECTED is already taken care of elsewhere */
if (eos && (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED)) { if (eos && (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED)) {
@ -2634,8 +2634,8 @@ gst_queue2_get_range (GstPad * pad, guint64 offset, guint length,
queue = GST_QUEUE2_CAST (gst_pad_get_parent (pad)); queue = GST_QUEUE2_CAST (gst_pad_get_parent (pad));
GST_QUEUE2_MUTEX_LOCK_CHECK (queue, queue->srcresult, out_flushing);
length = (length == -1) ? DEFAULT_BUFFER_SIZE : length; length = (length == -1) ? DEFAULT_BUFFER_SIZE : length;
GST_QUEUE2_MUTEX_LOCK_CHECK (queue, queue->srcresult, out_flushing);
offset = (offset == -1) ? queue->current->reading_pos : offset; offset = (offset == -1) ? queue->current->reading_pos : offset;
GST_DEBUG_OBJECT (queue, GST_DEBUG_OBJECT (queue,