#define GST_BUFFER_POOL_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_BUFFER_POOL, GstBufferPoolPrivate))
+#define GST_BUFFER_POOL_LOCK(pool) (g_static_rec_mutex_lock(&pool->priv->rec_lock))
+#define GST_BUFFER_POOL_UNLOCK(pool) (g_static_rec_mutex_unlock(&pool->priv->rec_lock))
+
struct _GstBufferPoolPrivate
{
+ GStaticRecMutex rec_lock;
guint min_buffers;
guint max_buffers;
guint size;
{
pool->priv = GST_BUFFER_POOL_GET_PRIVATE (pool);
- pool->config = gst_structure_id_new (GST_QUARK (BUFFER_POOL_CONFIG),
- GST_QUARK (SIZE), G_TYPE_UINT, 0,
- GST_QUARK (MIN_BUFFERS), G_TYPE_UINT, 0,
- GST_QUARK (MAX_BUFFERS), G_TYPE_UINT, 0,
- GST_QUARK (PREFIX), G_TYPE_UINT, 0,
- GST_QUARK (POSTFIX), G_TYPE_UINT, 0,
- GST_QUARK (ALIGN), G_TYPE_UINT, 1, NULL);
+ g_static_rec_mutex_init (&pool->priv->rec_lock);
+
pool->poll = gst_poll_new_timer ();
pool->queue = gst_atomic_queue_new (10);
+ pool->config = gst_structure_id_empty_new (GST_QUARK (BUFFER_POOL_CONFIG));
+ gst_buffer_pool_config_set (pool->config, 0, 0, 0, 0, 0, 1);
default_set_active (pool, FALSE);
GST_DEBUG_OBJECT (pool, "created");
}
static void
+default_free_buffer (GstBufferPool * pool, GstBuffer * buffer)
+{
+ gst_buffer_unref (buffer);
+}
+
+static void
+flush_buffers (GstBufferPool * pool)
+{
+ GstBuffer *buffer;
+ GstBufferPoolClass *pclass;
+
+ pclass = GST_BUFFER_POOL_GET_CLASS (pool);
+
+ /* clear the pool */
+ while ((buffer = gst_atomic_queue_pop (pool->queue))) {
+ gst_poll_read_control (pool->poll);
+
+ if (G_LIKELY (pclass->free_buffer))
+ pclass->free_buffer (pool, buffer);
+ }
+}
+
+static void
gst_buffer_pool_finalize (GObject * object)
{
GstBufferPool *pool;
GST_DEBUG_OBJECT (pool, "finalize");
gst_buffer_pool_set_active (pool, FALSE);
+ flush_buffers (pool);
gst_atomic_queue_unref (pool->queue);
gst_poll_free (pool->poll);
gst_structure_free (pool->config);
+ g_static_rec_mutex_free (&pool->priv->rec_lock);
G_OBJECT_CLASS (gst_buffer_pool_parent_class)->finalize (object);
}
return result;
}
-static void
-default_free_buffer (GstBufferPool * pool, GstBuffer * buffer)
-{
- gst_buffer_unref (buffer);
-}
-
-static void
-free_buffer (GstBufferPool * pool, GstBuffer * buffer)
-{
- GstBufferPoolClass *pclass;
-
- pclass = GST_BUFFER_POOL_GET_CLASS (pool);
-
- if (G_LIKELY (pclass->free_buffer))
- pclass->free_buffer (pool, buffer);
-}
-
/* the default implementation for allocating and freeing the
* buffers when changing the active state */
static gboolean
gst_atomic_queue_push (pool->queue, buffer);
gst_poll_write_control (pool->poll);
}
- } else {
- GstBuffer *buffer;
-
- /* clear the pool */
- while ((buffer = gst_atomic_queue_pop (pool->queue))) {
- gst_poll_read_control (pool->poll);
- free_buffer (pool, buffer);
- }
}
return TRUE;
}
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
+ GST_BUFFER_POOL_LOCK (pool);
/* just return if we are already in the right state */
- if (!g_atomic_int_compare_and_exchange (&pool->active, !active, active))
- return TRUE;
+ if (pool->active == active)
+ goto was_ok;
/* we need to be configured */
- if (!g_atomic_int_get (&pool->configured))
- return FALSE;
+ if (!pool->configured)
+ goto not_configured;
- if (!active)
+ if (!active) {
+ g_atomic_int_set (&pool->flushing, TRUE);
gst_poll_write_control (pool->poll);
+ }
if (G_LIKELY (pclass->set_active))
res = pclass->set_active (pool, active);
else
res = TRUE;
- if (active)
- gst_poll_read_control (pool->poll);
+ if (res) {
+ if (active) {
+ gst_poll_read_control (pool->poll);
+ g_atomic_int_set (&pool->flushing, FALSE);
+ }
+
+ pool->active = active;
+ }
+ GST_BUFFER_POOL_UNLOCK (pool);
return res;
+
+was_ok:
+ {
+ GST_BUFFER_POOL_UNLOCK (pool);
+ return TRUE;
+ }
+not_configured:
+ {
+ GST_BUFFER_POOL_UNLOCK (pool);
+ return FALSE;
+ }
}
static gboolean
g_return_val_if_fail (GST_IS_BUFFER_POOL (pool), FALSE);
g_return_val_if_fail (config != NULL, FALSE);
+ GST_BUFFER_POOL_LOCK (pool);
/* can't change the settings when active */
- if (g_atomic_int_get (&pool->active))
- return FALSE;
+ if (pool->active)
+ goto was_active;
/* we can't change when outstanding buffers */
if (g_atomic_int_get (&pool->outstanding) != 0)
- return FALSE;
+ goto have_outstanding;
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
pool->config = config;
/* now we are configured */
- g_atomic_int_set (&pool->configured, 1);
+ pool->configured = TRUE;
}
+ GST_BUFFER_POOL_UNLOCK (pool);
return result;
+
+ /* ERRORS */
+was_active:
+ {
+ GST_BUFFER_POOL_UNLOCK (pool);
+ return FALSE;
+ }
+have_outstanding:
+ {
+ GST_BUFFER_POOL_UNLOCK (pool);
+ return FALSE;
+ }
}
/**
* gst_buffer_pool_get_config:
* @pool: a #GstBufferPool
*
- * Get the current configuration of the pool. This configuration is read-only,
- * use gst_structure_copy() to make a writable copy.
+ * Get a copy of the current configuration of the pool. This configuration
+ * can either be modified and used for the gst_buffer_pool_set_config() call
+ * or it must be freed after usage.
+ *
+ * Returns: a copy of the current configuration of @pool. use
+ * gst_structure_free() after usage or gst_buffer_pool_set_config().
*/
-const GstStructure *
+GstStructure *
gst_buffer_pool_get_config (GstBufferPool * pool)
{
+ GstStructure *result;
+
g_return_val_if_fail (GST_IS_BUFFER_POOL (pool), NULL);
- return pool->config;
+ GST_BUFFER_POOL_UNLOCK (pool);
+ result = gst_structure_copy (pool->config);
+ GST_BUFFER_POOL_UNLOCK (pool);
+
+ return result;
}
/**
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
while (TRUE) {
- if (!g_atomic_int_get (&pool->active))
+ if (g_atomic_int_get (&pool->flushing))
return GST_FLOW_WRONG_STATE;
/* try to get a buffer from the queue */
static void
default_release_buffer (GstBufferPool * pool, GstBuffer * buffer)
{
- if (G_UNLIKELY (!g_atomic_int_get (&pool->active))) {
- /* we are inactive, remove the buffer again */
- free_buffer (pool, buffer);
- } else {
- /* keep it around in our queue */
- gst_atomic_queue_push (pool->queue, buffer);
- gst_poll_write_control (pool->poll);
- }
+ /* keep it around in our queue */
+ gst_atomic_queue_push (pool->queue, buffer);
+ gst_poll_write_control (pool->poll);
}
/**
if (G_LIKELY (pclass->release_buffer))
pclass->release_buffer (pool, buffer);
- g_atomic_int_exchange_and_add (&pool->outstanding, -1);
+ if (G_UNLIKELY (g_atomic_int_get (&pool->flushing))) {
+ if (g_atomic_int_dec_and_test (&pool->outstanding)) {
+ flush_buffers (pool);
+ }
+ }
}
projects / platform / upstream / gstreamer.git / commitdiff