From: Olivier Crête <olivier.crete@collabora.com>
Date: Sat, 20 May 2017 16:10:29 +0000 (+0200)
Subject: videoaggregator: Create normal video pool as a fallback
X-Git-Tag: 1.19.3~511^2~1294^2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af28bcab138d159c36938d2d0a68deea5065acfd;p=platform%2Fupstream%2Fgstreamer.git

videoaggregator: Create normal video pool as a fallback

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

diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index 88f9a69..2b3cf6f 100644
--- a/gst-libs/gst/video/gstvideoaggregator.c
+++ b/gst-libs/gst/video/gstvideoaggregator.c
@@ -1898,10 +1898,16 @@ gst_video_aggregator_release_pad (GstElement * element, GstPad * pad)
 }
 
 static gboolean
-gst_video_aggregator_decide_allocation (GstAggregator * self, GstQuery * query)
+gst_video_aggregator_decide_allocation (GstAggregator * agg, GstQuery * query)
 {
+  GstVideoAggregator *vagg = GST_VIDEO_AGGREGATOR (agg);
   GstAllocationParams params = { 0, 15, 0, 0 };
   guint i;
+  GstBufferPool *pool;
+  guint size, min, max;
+  gboolean update = FALSE;
+  GstStructure *config = NULL;
+  GstCaps *caps = NULL;
 
   if (gst_query_get_n_allocation_params (query) == 0)
     gst_query_add_allocation_param (query, NULL, &params);
@@ -1914,6 +1920,43 @@ gst_video_aggregator_decide_allocation (GstAggregator * self, GstQuery * query)
       gst_query_set_nth_allocation_param (query, i, allocator, &params);
     }
 
+  if (gst_query_get_n_allocation_pools (query) > 0) {
+    gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
+
+    /* adjust size */
+    size = MAX (size, vagg->info.size);
+    update = TRUE;
+  } else {
+    pool = NULL;
+    size = vagg->info.size;
+    min = max = 0;
+    update = FALSE;
+  }
+
+  /* no downstream pool, make our own */
+  if (pool == NULL)
+    pool = gst_video_buffer_pool_new ();
+
+  config = gst_buffer_pool_get_config (pool);
+
+  gst_query_parse_allocation (query, &caps, NULL);
+  if (caps)
+    gst_buffer_pool_config_set_params (config, caps, size, min, max);
+
+  if (gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL)) {
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
+  }
+  gst_buffer_pool_set_config (pool, config);
+
+  if (update)
+    gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
+  else
+    gst_query_add_allocation_pool (query, pool, size, min, max);
+
+  if (pool)
+    gst_object_unref (pool);
+
   return TRUE;
 }