*/
#include "gst_private.h"
+#include "glib-compat-private.h"
#include <errno.h>
#ifdef HAVE_UNISTD_H
#endif
#include <sys/types.h>
+#include "gstatomicqueue.h"
+#include "gstpoll.h"
#include "gstinfo.h"
#include "gstquark.h"
+#include "gstvalue.h"
#include "gstbufferpool.h"
#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))
+#define GST_BUFFER_POOL_LOCK(pool) (g_rec_mutex_lock(&pool->priv->rec_lock))
+#define GST_BUFFER_POOL_UNLOCK(pool) (g_rec_mutex_unlock(&pool->priv->rec_lock))
struct _GstBufferPoolPrivate
{
- GStaticRecMutex rec_lock;
+ GstAtomicQueue *queue;
+ GstPoll *poll;
+
+ GRecMutex rec_lock;
+
+ gboolean started;
+ gboolean active;
+ gint outstanding;
+
+ gboolean configured;
+ GstStructure *config;
+
guint size;
guint min_buffers;
guint max_buffers;
GstBuffer ** buffer, GstBufferPoolParams * params);
static GstFlowReturn default_acquire_buffer (GstBufferPool * pool,
GstBuffer ** buffer, GstBufferPoolParams * params);
+static void default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer,
+ GstBufferPoolParams * params);
static void default_free_buffer (GstBufferPool * pool, GstBuffer * buffer);
static void default_release_buffer (GstBufferPool * pool, GstBuffer * buffer);
klass->stop = default_stop;
klass->set_config = default_set_config;
klass->acquire_buffer = default_acquire_buffer;
+ klass->reset_buffer = default_reset_buffer;
klass->alloc_buffer = default_alloc_buffer;
klass->release_buffer = default_release_buffer;
klass->free_buffer = default_free_buffer;
{
pool->priv = GST_BUFFER_POOL_GET_PRIVATE (pool);
- g_static_rec_mutex_init (&pool->priv->rec_lock);
+ g_rec_mutex_init (&pool->priv->rec_lock);
- pool->poll = gst_poll_new_timer ();
- pool->queue = gst_atomic_queue_new (10);
- pool->flushing = TRUE;
- pool->active = FALSE;
- pool->configured = FALSE;
- pool->started = FALSE;
- pool->config = gst_structure_id_empty_new (GST_QUARK (BUFFER_POOL_CONFIG));
- gst_buffer_pool_config_set (pool->config, NULL, 0, 0, 0, 0, 1);
+ pool->priv->poll = gst_poll_new_timer ();
+ pool->priv->queue = gst_atomic_queue_new (10);
+ pool->flushing = 1;
+ pool->priv->active = FALSE;
+ pool->priv->configured = FALSE;
+ pool->priv->started = FALSE;
+ pool->priv->config =
+ gst_structure_new_id_empty (GST_QUARK (BUFFER_POOL_CONFIG));
+ gst_buffer_pool_config_set (pool->priv->config, NULL, 0, 0, 0, 0, 0);
+ gst_poll_write_control (pool->priv->poll);
GST_DEBUG_OBJECT (pool, "created");
}
GST_DEBUG_OBJECT (pool, "finalize");
gst_buffer_pool_set_active (pool, FALSE);
- 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);
+ gst_atomic_queue_unref (pool->priv->queue);
+ gst_poll_free (pool->priv->poll);
+ gst_structure_free (pool->priv->config);
+ g_rec_mutex_clear (&pool->priv->rec_lock);
G_OBJECT_CLASS (gst_buffer_pool_parent_class)->finalize (object);
}
*
* Creates a new #GstBufferPool instance.
*
- * Returns: a new #GstBufferPool instance
+ * Returns: (transfer full): a new #GstBufferPool instance
*/
GstBufferPool *
gst_buffer_pool_new (void)
return GST_FLOW_OK;
}
+static gboolean
+mark_meta_pooled (GstBuffer * buffer, GstMeta ** meta, gpointer user_data)
+{
+ GST_META_FLAG_SET (*meta, GST_META_FLAG_POOLED);
+
+ return TRUE;
+}
+
/* the default implementation for preallocating the buffers
* in the pool */
static gboolean
if (pclass->alloc_buffer (pool, &buffer, NULL) != GST_FLOW_OK)
goto alloc_failed;
+ gst_buffer_foreach_meta (buffer, mark_meta_pooled, pool);
GST_LOG_OBJECT (pool, "prealloced buffer %d: %p", i, buffer);
/* release to the queue, we call the vmethod directly, we don't need to do
* the other refcount handling right now. */
static gboolean
do_start (GstBufferPool * pool)
{
- if (!pool->started) {
+ if (!pool->priv->started) {
GstBufferPoolClass *pclass;
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
if (!pclass->start (pool))
return FALSE;
}
- pool->started = TRUE;
+ pool->priv->started = TRUE;
}
return TRUE;
}
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
/* clear the pool */
- while ((buffer = gst_atomic_queue_pop (pool->queue))) {
+ while ((buffer = gst_atomic_queue_pop (pool->priv->queue))) {
GST_LOG_OBJECT (pool, "freeing %p", buffer);
- gst_poll_read_control (pool->poll);
+ gst_poll_read_control (pool->priv->poll);
if (G_LIKELY (pclass->free_buffer))
pclass->free_buffer (pool, buffer);
static gboolean
do_stop (GstBufferPool * pool)
{
- if (pool->started) {
+ if (pool->priv->started) {
GstBufferPoolClass *pclass;
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
if (!pclass->stop (pool))
return FALSE;
}
- pool->started = FALSE;
+ pool->priv->started = FALSE;
}
return TRUE;
}
* @active: the new active state
*
* Control the active state of @pool. When the pool is active, new calls to
- * gst_buffer_pool_acquire_buffer() will return with GST_FLOW_WRONG_STATE.
+ * gst_buffer_pool_acquire_buffer() will return with GST_FLOW_FLUSHING.
+ *
+ * Activating the bufferpool will preallocate all resources in the pool based on
+ * the configuration of the pool.
+ *
+ * Deactivating will free the resources again when there are no outstanding
+ * buffers. When there are outstanding buffers, they will be freed as soon as
+ * they are all returned to the pool.
*
* Returns: %FALSE when the pool was not configured or when preallocation of the
* buffers failed.
GST_BUFFER_POOL_LOCK (pool);
/* just return if we are already in the right state */
- if (pool->active == active)
+ if (pool->priv->active == active)
goto was_ok;
/* we need to be configured */
- if (!pool->configured)
+ if (!pool->priv->configured)
goto not_configured;
if (active) {
goto start_failed;
/* unset the flushing state now */
- gst_poll_read_control (pool->poll);
- g_atomic_int_set (&pool->flushing, FALSE);
+ gst_poll_read_control (pool->priv->poll);
+ g_atomic_int_set (&pool->flushing, 0);
} else {
gint outstanding;
/* set to flushing first */
- g_atomic_int_set (&pool->flushing, TRUE);
- gst_poll_write_control (pool->poll);
+ g_atomic_int_set (&pool->flushing, 1);
+ gst_poll_write_control (pool->priv->poll);
/* when all buffers are in the pool, free them. Else they will be
* freed when they are released */
- outstanding = g_atomic_int_get (&pool->outstanding);
+ outstanding = g_atomic_int_get (&pool->priv->outstanding);
GST_LOG_OBJECT (pool, "outstanding buffers %d", outstanding);
if (outstanding == 0) {
if (!do_stop (pool))
goto stop_failed;
}
}
- pool->active = active;
+ pool->priv->active = active;
GST_BUFFER_POOL_UNLOCK (pool);
return res;
}
}
+/**
+ * gst_buffer_pool_is_active:
+ * @pool: a #GstBufferPool
+ *
+ * Check if @pool is active. A pool can be activated with the
+ * gst_buffer_pool_set_active() call.
+ *
+ * Returns: %TRUE when the pool is active.
+ */
+gboolean
+gst_buffer_pool_is_active (GstBufferPool * pool)
+{
+ gboolean res;
+
+ GST_BUFFER_POOL_LOCK (pool);
+ res = pool->priv->active;
+ GST_BUFFER_POOL_UNLOCK (pool);
+
+ return res;
+}
+
static gboolean
default_set_config (GstBufferPool * pool, GstStructure * config)
{
/**
* gst_buffer_pool_set_config:
* @pool: a #GstBufferPool
- * @config: a #GstStructure
+ * @config: (transfer full): a #GstStructure
*
* Set the configuration of the pool. The pool must be inactive and all buffers
* allocated form this pool must be returned or else this function will do
GST_BUFFER_POOL_LOCK (pool);
/* can't change the settings when active */
- if (pool->active)
+ if (pool->priv->active)
goto was_active;
/* we can't change when outstanding buffers */
- if (g_atomic_int_get (&pool->outstanding) != 0)
+ if (g_atomic_int_get (&pool->priv->outstanding) != 0)
goto have_outstanding;
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
result = FALSE;
if (result) {
- if (pool->config)
- gst_structure_free (pool->config);
- pool->config = config;
+ if (pool->priv->config)
+ gst_structure_free (pool->priv->config);
+ pool->priv->config = config;
/* now we are configured */
- pool->configured = TRUE;
+ pool->priv->configured = TRUE;
}
GST_BUFFER_POOL_UNLOCK (pool);
* 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
+ * Returns: (transfer full): a copy of the current configuration of @pool. use
* gst_structure_free() after usage or gst_buffer_pool_set_config().
*/
GstStructure *
g_return_val_if_fail (GST_IS_BUFFER_POOL (pool), NULL);
GST_BUFFER_POOL_UNLOCK (pool);
- result = gst_structure_copy (pool->config);
+ result = gst_structure_copy (pool->priv->config);
GST_BUFFER_POOL_UNLOCK (pool);
return result;
}
-static const gchar *empty_meta[] = { NULL };
+static const gchar *empty_option[] = { NULL };
/**
- * gst_buffer_pool_get_metas:
+ * gst_buffer_pool_get_options:
* @pool: a #GstBufferPool
*
- * Get a NULL terminated array of string with supported #GstMeta apis for
- * @pool. The requested api would typically be added to the config with
- * gst_buffer_pool_config_add_meta().
+ * Get a NULL terminated array of string with supported bufferpool options for
+ * @pool. An option would typically be enabled with
+ * gst_buffer_pool_config_add_option().
*
- * Returns: a NULL terminated array of strings.
+ * Returns: (array zero-terminated=1) (transfer none): a NULL terminated array of strings.
*/
const gchar **
-gst_buffer_pool_get_metas (GstBufferPool * pool)
+gst_buffer_pool_get_options (GstBufferPool * pool)
{
GstBufferPoolClass *pclass;
const gchar **result;
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
- if (G_LIKELY (pclass->get_metas))
- result = pclass->get_metas (pool);
- else
- result = empty_meta;
+ if (G_LIKELY (pclass->get_options)) {
+ if ((result = pclass->get_options (pool)) == NULL)
+ goto invalid_result;
+ } else
+ result = empty_option;
return result;
+
+ /* ERROR */
+invalid_result:
+ {
+ g_warning ("bufferpool subclass returned NULL options");
+ return empty_option;
+ }
+}
+
+/**
+ * gst_buffer_pool_has_option:
+ * @pool: a #GstBufferPool
+ * @option: an option
+ *
+ * Check if the bufferpool supports @option.
+ *
+ * Returns: a NULL terminated array of strings.
+ */
+gboolean
+gst_buffer_pool_has_option (GstBufferPool * pool, const gchar * option)
+{
+ guint i;
+ const gchar **options;
+
+ g_return_val_if_fail (GST_IS_BUFFER_POOL (pool), FALSE);
+ g_return_val_if_fail (option != NULL, FALSE);
+
+ options = gst_buffer_pool_get_options (pool);
+
+ for (i = 0; options[i]; i++) {
+ if (g_str_equal (options[i], option))
+ return TRUE;
+ }
+ return FALSE;
}
/**
}
/**
- * gst_buffer_pool_config_add_meta:
+ * gst_buffer_pool_config_add_option:
* @config: a #GstBufferPool configuration
- * @api: an API to add
+ * @option: an option to add
*
- * Adds the metadata api to @config. This will instruct the @bufferpool to use
- * the specified metadata api on the buffers that it allocates.
+ * Enabled the option in @config. This will instruct the @bufferpool to enable
+ * the specified option on the buffers that it allocates.
*
- * The supported API by @pool can be retrieved with gst_buffer_pool_get_metas().
+ * The supported options by @pool can be retrieved with gst_buffer_pool_get_options().
*/
void
-gst_buffer_pool_config_add_meta (GstStructure * config, const gchar * api)
+gst_buffer_pool_config_add_option (GstStructure * config, const gchar * option)
{
- GValueArray *array;
const GValue *value;
- GValue api_value = { 0 };
+ GValue option_value = { 0, };
+ guint i, len;
g_return_if_fail (config != NULL);
- value = gst_structure_id_get_value (config, GST_QUARK (META));
+ value = gst_structure_id_get_value (config, GST_QUARK (OPTIONS));
if (value) {
- array = (GValueArray *) g_value_get_boxed (value);
+ len = gst_value_array_get_size (value);
+ for (i = 0; i < len; ++i) {
+ const GValue *nth_val = gst_value_array_get_value (value, i);
+
+ if (g_str_equal (option, g_value_get_string (nth_val)))
+ return;
+ }
} else {
GValue new_array_val = { 0, };
- array = g_value_array_new (0);
-
- g_value_init (&new_array_val, G_TYPE_VALUE_ARRAY);
- g_value_take_boxed (&new_array_val, array);
-
- gst_structure_id_take_value (config, GST_QUARK (META), &new_array_val);
+ g_value_init (&new_array_val, GST_TYPE_ARRAY);
+ gst_structure_id_take_value (config, GST_QUARK (OPTIONS), &new_array_val);
+ value = gst_structure_id_get_value (config, GST_QUARK (OPTIONS));
}
-
- g_value_init (&api_value, G_TYPE_STRING);
- g_value_set_string (&api_value, api);
- g_value_array_append (array, &api_value);
- g_value_unset (&api_value);
+ g_value_init (&option_value, G_TYPE_STRING);
+ g_value_set_string (&option_value, option);
+ gst_value_array_append_value ((GValue *) value, &option_value);
+ g_value_unset (&option_value);
}
/**
- * gst_buffer_pool_config_n_metas:
+ * gst_buffer_pool_config_n_options:
* @config: a #GstBufferPool configuration
*
* Retrieve the number of values currently stored in the
- * meta API array of the @config structure.
+ * options array of the @config structure.
*
- * Returns: the metadata API array size as a #guint.
+ * Returns: the options array size as a #guint.
*/
guint
-gst_buffer_pool_config_n_metas (GstStructure * config)
+gst_buffer_pool_config_n_options (GstStructure * config)
{
- GValueArray *array;
const GValue *value;
guint size = 0;
g_return_val_if_fail (config != NULL, 0);
- value = gst_structure_id_get_value (config, GST_QUARK (META));
+ value = gst_structure_id_get_value (config, GST_QUARK (OPTIONS));
if (value) {
- array = (GValueArray *) g_value_get_boxed (value);
- size = array->n_values;
+ size = gst_value_array_get_size (value);
}
return size;
}
/**
- * gst_buffer_pool_config_get_meta:
+ * gst_buffer_pool_config_get_option:
* @config: a #GstBufferPool configuration
- * @index: position in the metadata API array to read
+ * @index: position in the option array to read
*
- * Parse an available @config and get the metadata API
- * at @index of the metadata API array.
+ * Parse an available @config and get the option
+ * at @index of the options API array.
*
- * Returns: a #gchar of the metadata API at @index.
+ * Returns: a #gchar of the option at @index.
*/
const gchar *
-gst_buffer_pool_config_get_meta (GstStructure * config, guint index)
+gst_buffer_pool_config_get_option (GstStructure * config, guint index)
{
const GValue *value;
const gchar *ret = NULL;
g_return_val_if_fail (config != NULL, 0);
- value = gst_structure_id_get_value (config, GST_QUARK (META));
+ value = gst_structure_id_get_value (config, GST_QUARK (OPTIONS));
if (value) {
- GValueArray *meta;
- GValue *api_value;
+ const GValue *option_value;
- meta = (GValueArray *) g_value_get_boxed (value);
- api_value = g_value_array_get_nth (meta, index);
-
- if (api_value)
- ret = g_value_get_string (api_value);
+ option_value = gst_value_array_get_value (value, index);
+ if (option_value)
+ ret = g_value_get_string (option_value);
}
return ret;
}
/**
- * gst_buffer_pool_config_has_meta:
+ * gst_buffer_pool_config_has_option:
* @config: a #GstBufferPool configuration
- * @api: a metadata api
+ * @option: an option
*
- * Check if @config contains @api metadata.
+ * Check if @config contains @option
*
- * Returns: TRUE if the metadata array contain @api.
+ * Returns: TRUE if the options array contains @option.
*/
gboolean
-gst_buffer_pool_config_has_meta (GstStructure * config, const gchar * api)
+gst_buffer_pool_config_has_option (GstStructure * config, const gchar * option)
{
const GValue *value;
+ guint i, len;
g_return_val_if_fail (config != NULL, 0);
- value = gst_structure_id_get_value (config, GST_QUARK (META));
+ value = gst_structure_id_get_value (config, GST_QUARK (OPTIONS));
if (value) {
- GValueArray *array;
- GValue *api_value;
- gint i;
-
- array = (GValueArray *) g_value_get_boxed (value);
- for (i = 0; i < array->n_values; i++) {
- api_value = g_value_array_get_nth (array, i);
- if (!strcmp (api, g_value_get_string (api_value)))
+ len = gst_value_array_get_size (value);
+ for (i = 0; i < len; ++i) {
+ const GValue *nth_val = gst_value_array_get_value (value, i);
+
+ if (g_str_equal (option, g_value_get_string (nth_val)))
return TRUE;
}
}
/**
* gst_buffer_pool_config_get:
- * @config: a #GstBufferPool configuration
- * @caps: the caps of buffers
- * @size: the size of each buffer, not including prefix
- * @min_buffers: the minimum amount of buffers to allocate.
- * @max_buffers: the maximum amount of buffers to allocate or 0 for unlimited.
- * @prefix: prefix each buffer with this many bytes
- * @align: alignment of the buffer data.
+ * @config: (transfer none): a #GstBufferPool configuration
+ * @caps: (out): the caps of buffers
+ * @size: (out): the size of each buffer, not including prefix
+ * @min_buffers: (out): the minimum amount of buffers to allocate.
+ * @max_buffers: (out): the maximum amount of buffers to allocate or 0 for unlimited.
+ * @prefix: (out): prefix each buffer with this many bytes
+ * @align: (out): alignment of the buffer data.
*
* Get the configuration values from @config.
*/
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
while (TRUE) {
- if (G_UNLIKELY (g_atomic_int_get (&pool->flushing)))
+ if (G_UNLIKELY (GST_BUFFER_POOL_IS_FLUSHING (pool)))
goto flushing;
/* try to get a buffer from the queue */
- *buffer = gst_atomic_queue_pop (pool->queue);
+ *buffer = gst_atomic_queue_pop (pool->priv->queue);
if (G_LIKELY (*buffer)) {
- gst_poll_read_control (pool->poll);
+ gst_poll_read_control (pool->priv->poll);
result = GST_FLOW_OK;
GST_LOG_OBJECT (pool, "acquired buffer %p", *buffer);
break;
/* no max_buffers, we allocate some more */
if (G_LIKELY (pclass->alloc_buffer)) {
result = pclass->alloc_buffer (pool, buffer, params);
+ if (result == GST_FLOW_OK && *buffer)
+ gst_buffer_foreach_meta (*buffer, mark_meta_pooled, pool);
+ else
+ result = GST_FLOW_ERROR;
} else
result = GST_FLOW_NOT_SUPPORTED;
GST_LOG_OBJECT (pool, "alloc buffer %p", *buffer);
/* check if we need to wait */
if (params && (params->flags & GST_BUFFER_POOL_FLAG_DONTWAIT)) {
GST_LOG_OBJECT (pool, "no more buffers");
- result = GST_FLOW_UNEXPECTED;
+ result = GST_FLOW_EOS;
break;
}
/* now wait */
GST_LOG_OBJECT (pool, "waiting for free buffers");
- gst_poll_wait (pool->poll, GST_CLOCK_TIME_NONE);
+ gst_poll_wait (pool->priv->poll, GST_CLOCK_TIME_NONE);
}
return result;
flushing:
{
GST_DEBUG_OBJECT (pool, "we are flushing");
- return GST_FLOW_WRONG_STATE;
+ return GST_FLOW_FLUSHING;
}
}
static inline void
dec_outstanding (GstBufferPool * pool)
{
- if (g_atomic_int_dec_and_test (&pool->outstanding)) {
+ if (g_atomic_int_dec_and_test (&pool->priv->outstanding)) {
/* all buffers are returned to the pool, see if we need to free them */
- if (g_atomic_int_get (&pool->flushing)) {
+ if (GST_BUFFER_POOL_IS_FLUSHING (pool)) {
/* take the lock so that set_active is not run concurrently */
GST_BUFFER_POOL_LOCK (pool);
/* recheck the flushing state in the lock, the pool could have been
* set to active again */
- if (g_atomic_int_get (&pool->flushing))
+ if (GST_BUFFER_POOL_IS_FLUSHING (pool))
do_stop (pool);
GST_BUFFER_POOL_UNLOCK (pool);
}
}
+static gboolean
+remove_meta_unpooled (GstBuffer * buffer, GstMeta ** meta, gpointer user_data)
+{
+ if (!GST_META_FLAG_IS_SET (*meta, GST_META_FLAG_POOLED))
+ *meta = NULL;
+ return TRUE;
+}
+
+static void
+default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer,
+ GstBufferPoolParams * params)
+{
+ GST_BUFFER_FLAGS (buffer) = 0;
+
+ GST_BUFFER_PTS (buffer) = GST_CLOCK_TIME_NONE;
+ GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
+ GST_BUFFER_DURATION (buffer) = GST_CLOCK_TIME_NONE;
+ GST_BUFFER_OFFSET (buffer) = GST_BUFFER_OFFSET_NONE;
+ GST_BUFFER_OFFSET_END (buffer) = GST_BUFFER_OFFSET_NONE;
+
+ /* remove all metadata without the POOLED flag */
+ gst_buffer_foreach_meta (buffer, remove_meta_unpooled, pool);
+}
+
/**
* gst_buffer_pool_acquire_buffer:
* @pool: a #GstBufferPool
- * @buffer: a location for a #GstBuffer
- * @params: parameters.
+ * @buffer: (out): a location for a #GstBuffer
+ * @params: (transfer none) (allow-none) parameters.
*
* Acquire a buffer from @pool. @buffer should point to a memory location that
* can hold a pointer to the new buffer.
*
* @params can be NULL or contain optional parameters to influence the allocation.
*
- * Returns: a #GstFlowReturn such as GST_FLOW_WRONG_STATE when the pool is
+ * Returns: a #GstFlowReturn such as GST_FLOW_FLUSHING when the pool is
* inactive.
*/
GstFlowReturn
/* assume we'll have one more outstanding buffer we need to do that so
* that concurrent set_active doesn't clear the buffers */
- g_atomic_int_inc (&pool->outstanding);
+ g_atomic_int_inc (&pool->priv->outstanding);
if (G_LIKELY (pclass->acquire_buffer))
result = pclass->acquire_buffer (pool, buffer, params);
/* all buffers from the pool point to the pool and have the refcount of the
* pool incremented */
(*buffer)->pool = gst_object_ref (pool);
+ /* now reset the buffer when needed */
+ if (G_LIKELY (pclass->reset_buffer))
+ pclass->reset_buffer (pool, *buffer, params);
} else {
dec_outstanding (pool);
}
{
/* keep it around in our queue */
GST_LOG_OBJECT (pool, "released buffer %p", buffer);
- gst_atomic_queue_push (pool->queue, buffer);
- gst_poll_write_control (pool->poll);
+ gst_atomic_queue_push (pool->priv->queue, buffer);
+ gst_poll_write_control (pool->priv->poll);
}
/**
* gst_buffer_pool_release_buffer:
* @pool: a #GstBufferPool
- * @buffer: a #GstBuffer
+ * @buffer: (transfer none): a #GstBuffer
*
* Release @buffer to @pool. @buffer should have previously been allocated from
* @pool with gst_buffer_pool_acquire_buffer().
/* check that the buffer is ours, all buffers returned to the pool have the
* pool member set to NULL and the pool refcount decreased */
- if (!g_atomic_pointer_compare_and_exchange ((gpointer *) & buffer->pool,
- pool, NULL))
+ if (!g_atomic_pointer_compare_and_exchange (&buffer->pool, pool, NULL))
return;
pclass = GST_BUFFER_POOL_GET_CLASS (pool);
projects / platform / upstream / gstreamer.git / blobdiff