mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 10:12:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

waylandsink: Don't propose multiple time the same buffer pool

Browse source 
The buffer pool API does not allow multiple of owner. This otherwise
lead to error when renegotiation take place. Aso consider the
allocation query "need_pool" boolean.
This commit is contained in:
Nicolas Dufresne 2016-09-19 12:08:20 -04:00
parent 9357047eaf
commit 74a7baa533
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/wayland/gstwaylandsink.c
View file

@ -518,18 +518,29 @@ static gboolean
gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query) gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
{ {
GstWaylandSink *sink = GST_WAYLAND_SINK (bsink); GstWaylandSink *sink = GST_WAYLAND_SINK (bsink);
GstCaps *caps;
GstBufferPool *pool = NULL;
GstStructure *config; GstStructure *config;
guint size, min_bufs, max_bufs; guint size, min_bufs, max_bufs;
gboolean need_pool;
config = gst_buffer_pool_get_config (sink->pool); gst_query_parse_allocation (query, &caps, &need_pool);
gst_buffer_pool_config_get_params (config, NULL, &size, &min_bufs, &max_bufs);
if (need_pool)
pool = gst_wayland_create_pool (sink, caps);
if (pool) {
config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_get_params (config, NULL, &size, &min_bufs,
&max_bufs);
gst_query_add_allocation_pool (query, pool, size, min_bufs, max_bufs);
gst_structure_free (config);
g_object_unref (pool);
}
/* we do have a pool for sure (created in set_caps),
* so let's propose it anyway, but also propose the allocator on its own */
gst_query_add_allocation_pool (query, sink->pool, size, min_bufs, max_bufs);
gst_query_add_allocation_param (query, gst_wl_shm_allocator_get (), NULL); gst_query_add_allocation_param (query, gst_wl_shm_allocator_get (), NULL);
gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);
gst_structure_free (config);
return TRUE; return TRUE;
} }