From f66c6ced56888c37ae963f720afd161eecc5095c Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 19 May 2011 15:55:53 +0200
Subject: [PATCH] xvimagesink: improve allocation query

If the allocation query contains the same caps as the current allocator, we can
return that one instead of making a new one.
---
 sys/xvimage/xvimagesink.c | 46 +++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 407e0868e1..333cd52d84 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1694,6 +1694,7 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
 
   oldpool = xvimagesink->pool;
   xvimagesink->pool = newpool;
+  g_mutex_unlock (xvimagesink->flow_lock);
 
   /* unref the old sink */
   if (oldpool) {
@@ -1701,7 +1702,6 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
     gst_buffer_pool_set_active (oldpool, FALSE);
     gst_object_unref (oldpool);
   }
-  g_mutex_unlock (xvimagesink->flow_lock);
 
   return TRUE;
 
@@ -1973,30 +1973,50 @@ gst_xvimagesink_sink_query (GstPad * sinkpad, GstQuery * query)
   switch (GST_QUERY_TYPE (query)) {
     case GST_QUERY_ALLOCATION:
     {
+      GstBufferPool *pool;
+      GstStructure *config;
       GstCaps *caps;
-      gboolean need_pool;
-      GstBufferPool *pool = NULL;
       guint size;
-      GstVideoFormat format;
-      gint width, height;
+      gboolean need_pool;
 
       gst_query_parse_allocation (query, &caps, &need_pool);
 
       if (caps == NULL)
         goto no_caps;
 
-      if (!gst_video_format_parse_caps (caps, &format, &width, &height))
-        goto invalid_caps;
+      g_mutex_lock (xvimagesink->flow_lock);
+      if ((pool = xvimagesink->pool))
+        gst_object_ref (pool);
+      g_mutex_unlock (xvimagesink->flow_lock);
 
-      /* the normal size of a frame */
-      size = gst_video_format_get_size (format, width, height);
+      if (pool != NULL) {
+        const GstCaps *pcaps;
 
-      if (need_pool) {
-        GstStructure *config;
+        /* 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;
 
-        /* create a new pool for the new configuration */
+        GST_DEBUG_OBJECT (xvimagesink, "create new pool");
         pool = gst_xvimage_buffer_pool_new (xvimagesink);
 
+        if (!gst_video_format_parse_caps (caps, &format, &width, &height))
+          goto invalid_caps;
+
+        /* the normal size of a frame */
+        size = gst_video_format_get_size (format, width, height);
+
         config = gst_buffer_pool_get_config (pool);
         gst_buffer_pool_config_set (config, caps, size, 0, 0, 0, 0, 16);
         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 */
       gst_query_add_allocation_meta (query, GST_META_API_VIDEO);
+
+      gst_object_unref (pool);
       break;
     }
     default:
-- 
2.34.1