mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

bufferpool: remove const from get/set_param

Browse source 
Remove the const from the GstCaps in get/set_param. set_param modifies
the refcount of the caps.
Don't increment the refcount of the caps result of get_param like we
do with other objects.
Update some annotiations.
This commit is contained in:
Wim Taymans 2012-03-27 12:40:36 +02:00
parent f09ab3b007
commit 08f33d8d93
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/gstbufferpool.c
View file

@ -434,7 +434,7 @@ static gboolean
default_set_config (GstBufferPool * pool, GstStructure * config) default_set_config (GstBufferPool * pool, GstStructure * config)
{ {
GstBufferPoolPrivate *priv = pool->priv; GstBufferPoolPrivate *priv = pool->priv;
const GstCaps *caps; GstCaps *caps;
guint size, min_buffers, max_buffers; guint size, min_buffers, max_buffers;
GstAllocator *allocator; GstAllocator *allocator;
GstAllocationParams params; GstAllocationParams params;
@ -641,7 +641,7 @@ gst_buffer_pool_has_option (GstBufferPool * pool, const gchar * option)
* Configure @config with the given parameters. * Configure @config with the given parameters.
*/ */
void void
gst_buffer_pool_config_set_params (GstStructure * config, const GstCaps * caps, gst_buffer_pool_config_set_params (GstStructure * config, GstCaps * caps,
guint size, guint min_buffers, guint max_buffers) guint size, guint min_buffers, guint max_buffers)
{ {
g_return_if_fail (config != NULL); g_return_if_fail (config != NULL);
@ -812,21 +812,26 @@ gst_buffer_pool_config_has_option (GstStructure * config, const gchar * option)
/** /**
* gst_buffer_pool_config_get_params: * gst_buffer_pool_config_get_params:
* @config: (transfer none): a #GstBufferPool configuration * @config: (transfer none): a #GstBufferPool configuration
* @caps: (out): the caps of buffers * @caps: (out) (transfer none) (allow-none): the caps of buffers
* @size: (out): the size of each buffer, not including prefix and padding * @size: (out) (allow-none): the size of each buffer, not including prefix and padding
* @min_buffers: (out): the minimum amount of buffers to allocate. * @min_buffers: (out) (allow-none): the minimum amount of buffers to allocate.
* @max_buffers: (out): the maximum amount of buffers to allocate or 0 for unlimited. * @max_buffers: (out) (allow-none): the maximum amount of buffers to allocate or 0 for unlimited.
* *
* Get the configuration values from @config. * Get the configuration values from @config.
*
* Returns: %TRUE if all parameters could be fetched.
*/ */
gboolean gboolean
gst_buffer_pool_config_get_params (GstStructure * config, const GstCaps ** caps, gst_buffer_pool_config_get_params (GstStructure * config, GstCaps ** caps,
guint * size, guint * min_buffers, guint * max_buffers) guint * size, guint * min_buffers, guint * max_buffers)
{ {
g_return_val_if_fail (config != NULL, FALSE); g_return_val_if_fail (config != NULL, FALSE);
if (caps) {
*caps = g_value_get_boxed (gst_structure_id_get_value (config,
GST_QUARK (CAPS)));
}
return gst_structure_id_get (config, return gst_structure_id_get (config,
GST_QUARK (CAPS), GST_TYPE_CAPS, caps,
GST_QUARK (SIZE), G_TYPE_UINT, size, GST_QUARK (SIZE), G_TYPE_UINT, size,
GST_QUARK (MIN_BUFFERS), G_TYPE_UINT, min_buffers, GST_QUARK (MIN_BUFFERS), G_TYPE_UINT, min_buffers,
GST_QUARK (MAX_BUFFERS), G_TYPE_UINT, max_buffers, NULL); GST_QUARK (MAX_BUFFERS), G_TYPE_UINT, max_buffers, NULL);

4
gst/gstbufferpool.h
View file

@ -181,9 +181,9 @@ gboolean gst_buffer_pool_has_option (GstBufferPool *pool, const gch
/* helpers for configuring the config structure */ /* helpers for configuring the config structure */
void gst_buffer_pool_config_set_params (GstStructure *config, const GstCaps *caps, void gst_buffer_pool_config_set_params (GstStructure *config, GstCaps *caps,
guint size, guint min_buffers, guint max_buffers); guint size, guint min_buffers, guint max_buffers);
gboolean gst_buffer_pool_config_get_params (GstStructure *config, const GstCaps **caps, gboolean gst_buffer_pool_config_get_params (GstStructure *config, GstCaps **caps,
guint *size, guint *min_buffers, guint *max_buffers); guint *size, guint *min_buffers, guint *max_buffers);
void gst_buffer_pool_config_set_allocator (GstStructure *config, GstAllocator *allocator, void gst_buffer_pool_config_set_allocator (GstStructure *config, GstAllocator *allocator,
const GstAllocationParams *params); const GstAllocationParams *params);