Request minimum buffer even if need_pool is FALSE

When tee is used, it will not request a pool, but still it wants to
know how many buffers are required.

https://bugzilla.gnome.org/show_bug.cgi?id=730758

diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index cf5f19c..9176ca6 100644 (file)
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -1463,6 +1463,7 @@ gst_x_image_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
   GstXImageSink *ximagesink = GST_X_IMAGE_SINK (bsink);
   GstBufferPool *pool = NULL;
   GstCaps *caps;
+  GstVideoInfo info;
   guint size;
   gboolean need_pool;
 
@@ -1471,26 +1472,23 @@ gst_x_image_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
   if (caps == NULL)
     goto no_caps;
 
-  if (need_pool) {
-    GstVideoInfo info;
+  if (!gst_video_info_from_caps (&info, caps))
+    goto invalid_caps;
 
-    if (!gst_video_info_from_caps (&info, caps))
-      goto invalid_caps;
+  /* the normal size of a frame */
+  size = info.size;
 
+  if (need_pool) {
     pool = gst_x_image_sink_create_pool (ximagesink, caps, info.size, 0);
 
-    /* the normal size of a frame */
-    size = info.size;
-
     if (pool == NULL)
       goto no_pool;
   }
 
-  if (pool) {
-    /* we need at least 2 buffer because we hold on to the last one */
-    gst_query_add_allocation_pool (query, pool, size, 2, 0);
+  /* we need at least 2 buffer because we hold on to the last one */
+  gst_query_add_allocation_pool (query, pool, size, 2, 0);
+  if (pool)
     gst_object_unref (pool);
-  }
 
   /* we also support various metadata */
   gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);

diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 9cd0da1..4ca0c11 100644 (file)
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1051,6 +1051,7 @@ gst_xv_image_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
   GstXvImageSink *xvimagesink = GST_XV_IMAGE_SINK (bsink);
   GstBufferPool *pool = NULL;
   GstCaps *caps;
+  GstVideoInfo info;
   guint size;
   gboolean need_pool;
 
@@ -1059,27 +1060,24 @@ gst_xv_image_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
   if (caps == NULL)
     goto no_caps;
 
-  if (need_pool) {
-    GstVideoInfo info;
+  if (!gst_video_info_from_caps (&info, caps))
+    goto invalid_caps;
 
-    if (!gst_video_info_from_caps (&info, caps))
-      goto invalid_caps;
+  /* the normal size of a frame */
+  size = info.size;
 
+  if (need_pool) {
     GST_DEBUG_OBJECT (xvimagesink, "create new pool");
     pool = gst_xv_image_sink_create_pool (xvimagesink, caps, info.size, 0);
 
-    /* the normal size of a frame */
-    size = info.size;
-
     if (pool == NULL)
       goto no_pool;
   }
 
-  if (pool) {
-    /* we need at least 2 buffer because we hold on to the last one */
-    gst_query_add_allocation_pool (query, pool, size, 2, 0);
+  /* we need at least 2 buffer because we hold on to the last one */
+  gst_query_add_allocation_pool (query, pool, size, 2, 0);
+  if (pool)
     gst_object_unref (pool);
-  }
 
   /* we also support various metadata */
   gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL);