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

basesrc: don't accidentally disable the pool

Browse source 
When we set a pool and it is the same as the old pool, don't disable the pool.
This commit is contained in:
Wim Taymans 2011-07-15 16:04:11 +01:00
parent 1dddb1f704
commit d23fc81c43
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/gst/base/gstbasesrc.c
View file

@ -2613,6 +2613,7 @@ gst_base_src_set_allocation (GstBaseSrc * basesrc, GstBufferPool * pool,
GstBaseSrcPrivate *priv = basesrc->priv; GstBaseSrcPrivate *priv = basesrc->priv;
if (pool) { if (pool) {
GST_DEBUG_OBJECT (basesrc, "activate pool");
if (!gst_buffer_pool_set_active (pool, TRUE)) if (!gst_buffer_pool_set_active (pool, TRUE))
goto activate_failed; goto activate_failed;
} }
@ -2628,7 +2629,11 @@ gst_base_src_set_allocation (GstBaseSrc * basesrc, GstBufferPool * pool,
GST_OBJECT_UNLOCK (basesrc); GST_OBJECT_UNLOCK (basesrc);
if (oldpool) { if (oldpool) {
gst_buffer_pool_set_active (oldpool, FALSE); /* only deactivate if the pool is not the one we're using */
if (oldpool != pool) {
GST_DEBUG_OBJECT (basesrc, "deactivate old pool");
gst_buffer_pool_set_active (oldpool, FALSE);
}
gst_object_unref (oldpool); gst_object_unref (oldpool);
} }
return TRUE; return TRUE;
@ -2684,7 +2689,8 @@ gst_base_src_prepare_allocation (GstBaseSrc * basesrc, GstCaps * caps)
if (G_LIKELY (bclass->setup_allocation)) if (G_LIKELY (bclass->setup_allocation))
result = bclass->setup_allocation (basesrc, query); result = bclass->setup_allocation (basesrc, query);
GST_DEBUG_OBJECT (basesrc, "ALLOCATION params: %" GST_PTR_FORMAT, query); GST_DEBUG_OBJECT (basesrc, "ALLOCATION (%d) params: %" GST_PTR_FORMAT, result,
query);
gst_query_parse_allocation_params (query, &size, &min, &max, &prefix, gst_query_parse_allocation_params (query, &size, &min, &max, &prefix,
&alignment, &pool); &alignment, &pool);
@ -2695,6 +2701,8 @@ gst_base_src_prepare_allocation (GstBaseSrc * basesrc, GstCaps * caps)
if (gst_query_get_n_allocation_memories (query) > 0) { if (gst_query_get_n_allocation_memories (query) > 0) {
mem = gst_query_parse_nth_allocation_memory (query, 0); mem = gst_query_parse_nth_allocation_memory (query, 0);
} }
GST_DEBUG_OBJECT (basesrc, "0 size, getting allocator %s",
GST_STR_NULL (mem));
allocator = gst_allocator_find (mem); allocator = gst_allocator_find (mem);
} else if (pool == NULL) { } else if (pool == NULL) {
/* fixed size, we can use a bufferpool */ /* fixed size, we can use a bufferpool */
@ -2702,6 +2710,7 @@ gst_base_src_prepare_allocation (GstBaseSrc * basesrc, GstCaps * caps)
/* we did not get a pool, make one ourselves then */ /* we did not get a pool, make one ourselves then */
pool = gst_buffer_pool_new (); pool = gst_buffer_pool_new ();
GST_DEBUG_OBJECT (basesrc, "no pool, making new pool");
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_set (config, caps, size, min, max, prefix, gst_buffer_pool_config_set (config, caps, size, min, max, prefix,