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

appsink: use GstQueueArray instead of GQueue for internal item queue

Browse source 
Performance optimisation.

Avoids alloc/free churn for the queue's list nodes.
This commit is contained in:
Tim-Philipp Müller 2018-01-31 20:11:41 +00:00
parent 1ba8cb2207
commit 8b22d47057
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst-libs/gst/app/gstappsink.c
View file

@ -67,9 +67,7 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbasesink.h> #include <gst/base/base.h>
#include <gst/gstbuffer.h>
#include <gst/gstbufferlist.h>
#include <string.h> #include <string.h>
@ -86,7 +84,7 @@ struct _GstAppSinkPrivate
GCond cond; GCond cond;
GMutex mutex; GMutex mutex;
GQueue *queue; GstQueueArray *queue;
GstBuffer *preroll_buffer; GstBuffer *preroll_buffer;
GstCaps *preroll_caps; GstCaps *preroll_caps;
GstCaps *last_caps; GstCaps *last_caps;
@ -454,7 +452,7 @@ gst_app_sink_init (GstAppSink * appsink)
g_mutex_init (&priv->mutex); g_mutex_init (&priv->mutex);
g_cond_init (&priv->cond); g_cond_init (&priv->cond);
priv->queue = g_queue_new (); priv->queue = gst_queue_array_new (16);
priv->emit_signals = DEFAULT_PROP_EMIT_SIGNALS; priv->emit_signals = DEFAULT_PROP_EMIT_SIGNALS;
priv->max_buffers = DEFAULT_PROP_MAX_BUFFERS; priv->max_buffers = DEFAULT_PROP_MAX_BUFFERS;
@ -484,7 +482,7 @@ gst_app_sink_dispose (GObject * obj)
GST_OBJECT_UNLOCK (appsink); GST_OBJECT_UNLOCK (appsink);
g_mutex_lock (&priv->mutex); g_mutex_lock (&priv->mutex);
while ((queue_obj = g_queue_pop_head (priv->queue))) while ((queue_obj = gst_queue_array_pop_head (priv->queue)))
gst_mini_object_unref (queue_obj); gst_mini_object_unref (queue_obj);
gst_buffer_replace (&priv->preroll_buffer, NULL); gst_buffer_replace (&priv->preroll_buffer, NULL);
gst_caps_replace (&priv->preroll_caps, NULL); gst_caps_replace (&priv->preroll_caps, NULL);
@ -502,7 +500,7 @@ gst_app_sink_finalize (GObject * obj)
g_mutex_clear (&priv->mutex); g_mutex_clear (&priv->mutex);
g_cond_clear (&priv->cond); g_cond_clear (&priv->cond);
g_queue_free (priv->queue); gst_queue_array_free (priv->queue);
G_OBJECT_CLASS (parent_class)->finalize (obj); G_OBJECT_CLASS (parent_class)->finalize (obj);
} }
@ -620,7 +618,7 @@ gst_app_sink_flush_unlocked (GstAppSink * appsink)
GST_DEBUG_OBJECT (appsink, "flush stop appsink"); GST_DEBUG_OBJECT (appsink, "flush stop appsink");
priv->is_eos = FALSE; priv->is_eos = FALSE;
gst_buffer_replace (&priv->preroll_buffer, NULL); gst_buffer_replace (&priv->preroll_buffer, NULL);
while ((obj = g_queue_pop_head (priv->queue))) while ((obj = gst_queue_array_pop_head (priv->queue)))
gst_mini_object_unref (obj); gst_mini_object_unref (obj);
priv->num_buffers = 0; priv->num_buffers = 0;
g_cond_signal (&priv->cond); g_cond_signal (&priv->cond);
@ -672,7 +670,7 @@ gst_app_sink_setcaps (GstBaseSink * sink, GstCaps * caps)
g_mutex_lock (&priv->mutex); g_mutex_lock (&priv->mutex);
GST_DEBUG_OBJECT (appsink, "receiving CAPS"); GST_DEBUG_OBJECT (appsink, "receiving CAPS");
g_queue_push_tail (priv->queue, gst_event_new_caps (caps)); gst_queue_array_push_tail (priv->queue, gst_event_new_caps (caps));
if (!priv->preroll_buffer) if (!priv->preroll_buffer)
gst_caps_replace (&priv->preroll_caps, caps); gst_caps_replace (&priv->preroll_caps, caps);
g_mutex_unlock (&priv->mutex); g_mutex_unlock (&priv->mutex);
@ -690,7 +688,7 @@ gst_app_sink_event (GstBaseSink * sink, GstEvent * event)
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT:
g_mutex_lock (&priv->mutex); g_mutex_lock (&priv->mutex);
GST_DEBUG_OBJECT (appsink, "receiving SEGMENT"); GST_DEBUG_OBJECT (appsink, "receiving SEGMENT");
g_queue_push_tail (priv->queue, gst_event_ref (event)); gst_queue_array_push_tail (priv->queue, gst_event_ref (event));
if (!priv->preroll_buffer) if (!priv->preroll_buffer)
gst_event_copy_segment (event, &priv->preroll_segment); gst_event_copy_segment (event, &priv->preroll_segment);
g_mutex_unlock (&priv->mutex); g_mutex_unlock (&priv->mutex);
@ -787,7 +785,7 @@ dequeue_buffer (GstAppSink * appsink)
GstMiniObject *obj; GstMiniObject *obj;
do { do {
obj = g_queue_pop_head (priv->queue); obj = gst_queue_array_pop_head (priv->queue);
if (GST_IS_BUFFER (obj) || GST_IS_BUFFER_LIST (obj)) { if (GST_IS_BUFFER (obj) || GST_IS_BUFFER_LIST (obj)) {
GST_DEBUG_OBJECT (appsink, "dequeued buffer/list %p", obj); GST_DEBUG_OBJECT (appsink, "dequeued buffer/list %p", obj);
@ -877,7 +875,7 @@ restart:
} }
} }
/* we need to ref the buffer/list when pushing it in the queue */ /* we need to ref the buffer/list when pushing it in the queue */
g_queue_push_tail (priv->queue, gst_mini_object_ref (data)); gst_queue_array_push_tail (priv->queue, gst_mini_object_ref (data));
priv->num_buffers++; priv->num_buffers++;
g_cond_signal (&priv->cond); g_cond_signal (&priv->cond);
emit = priv->emit_signals; emit = priv->emit_signals;