mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

xvimagesink: improve allocation query

Browse source 
If the allocation query contains the same caps as the current allocator, we can
return that one instead of making a new one.
This commit is contained in:
Wim Taymans 2011-05-19 15:55:53 +02:00
parent 0b3272108c
commit f66c6ced56
1 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sys/xvimage/xvimagesink.c
View file

@ -1694,6 +1694,7 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
oldpool = xvimagesink->pool; oldpool = xvimagesink->pool;
xvimagesink->pool = newpool; xvimagesink->pool = newpool;
g_mutex_unlock (xvimagesink->flow_lock);
/* unref the old sink */ /* unref the old sink */
if (oldpool) { if (oldpool) {
@ -1701,7 +1702,6 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
gst_buffer_pool_set_active (oldpool, FALSE); gst_buffer_pool_set_active (oldpool, FALSE);
gst_object_unref (oldpool); gst_object_unref (oldpool);
} }
g_mutex_unlock (xvimagesink->flow_lock);
return TRUE; return TRUE;
@ -1973,30 +1973,50 @@ gst_xvimagesink_sink_query (GstPad * sinkpad, GstQuery * query)
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_ALLOCATION: case GST_QUERY_ALLOCATION:
{ {
GstBufferPool *pool;
GstStructure *config;
GstCaps *caps; GstCaps *caps;
gboolean need_pool;
GstBufferPool *pool = NULL;
guint size; guint size;
GstVideoFormat format; gboolean need_pool;
gint width, height;
gst_query_parse_allocation (query, &caps, &need_pool); gst_query_parse_allocation (query, &caps, &need_pool);
if (caps == NULL) if (caps == NULL)
goto no_caps; goto no_caps;
g_mutex_lock (xvimagesink->flow_lock);
if ((pool = xvimagesink->pool))
gst_object_ref (pool);
g_mutex_unlock (xvimagesink->flow_lock);
if (pool != NULL) {
const GstCaps *pcaps;
/* we had a pool, check caps */
config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_get (config, &pcaps, &size, NULL, NULL, NULL,
NULL, NULL);
if (!gst_caps_is_equal (caps, pcaps)) {
GST_DEBUG_OBJECT (xvimagesink, "pool has different caps");
/* different caps, we can't use this pool */
gst_object_unref (pool);
pool = NULL;
}
}
if (pool == NULL && need_pool) {
GstVideoFormat format;
gint width, height;
GST_DEBUG_OBJECT (xvimagesink, "create new pool");
pool = gst_xvimage_buffer_pool_new (xvimagesink);
if (!gst_video_format_parse_caps (caps, &format, &width, &height)) if (!gst_video_format_parse_caps (caps, &format, &width, &height))
goto invalid_caps; goto invalid_caps;
/* the normal size of a frame */ /* the normal size of a frame */
size = gst_video_format_get_size (format, width, height); size = gst_video_format_get_size (format, width, height);
if (need_pool) {
GstStructure *config;
/* create a new pool for the new configuration */
pool = gst_xvimage_buffer_pool_new (xvimagesink);
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_set (config, caps, size, 0, 0, 0, 0, 16); gst_buffer_pool_config_set (config, caps, size, 0, 0, 0, 0, 16);
if (!gst_buffer_pool_set_config (pool, config)) if (!gst_buffer_pool_set_config (pool, config))
@ -2006,6 +2026,8 @@ gst_xvimagesink_sink_query (GstPad * sinkpad, GstQuery * query)
/* we also support various metadata */ /* we also support various metadata */
gst_query_add_allocation_meta (query, GST_META_API_VIDEO); gst_query_add_allocation_meta (query, GST_META_API_VIDEO);
gst_object_unref (pool);
break; break;
} }
default: default: