remove custom allocation query

When resolving bug 753914, a custom allocation query was added, overlapping
the responsibilities of GstVideoDecoder.

But with the merge of the patches from bug 764421 this overlapping was not
required anymore. This patch restores this situation setting the
allocation_caps in the GstVideoCodecState when needed.

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

diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c
index 3dbc2fa..4fba8fe 100644 (file)
--- a/gst/vaapi/gstvaapidecode.c
+++ b/gst/vaapi/gstvaapidecode.c
@@ -241,11 +241,13 @@ gst_vaapidecode_update_src_caps (GstVaapiDecode * decode)
   GstVideoCodecState *state, *ref_state;
   GstVaapiCapsFeature feature;
   GstCapsFeatures *features = NULL;
+  GstCaps *allocation_caps;
   GstVideoInfo *vi, *decoded_info;
   GstVideoFormat format = GST_VIDEO_FORMAT_NV12;
   GstClockTime latency;
   gint fps_d, fps_n;
   guint width, height;
+  const gchar *format_str;
 
   if (!decode->input_state)
     return FALSE;
@@ -302,6 +304,22 @@ gst_vaapidecode_update_src_caps (GstVaapiDecode * decode)
   state->caps = gst_video_info_to_caps (vi);
   if (features)
     gst_caps_set_features (state->caps, 0, features);
+
+  /* Allocation query is different from pad's caps */
+  allocation_caps = NULL;
+  if (GST_VIDEO_INFO_WIDTH (decoded_info) != width
+      || GST_VIDEO_INFO_HEIGHT (decoded_info) != height) {
+    allocation_caps = gst_caps_copy (state->caps);
+    format_str = gst_video_format_to_string (format);
+    gst_caps_set_simple (allocation_caps,
+        "width", G_TYPE_INT, GST_VIDEO_INFO_WIDTH (decoded_info),
+        "height", G_TYPE_INT, GST_VIDEO_INFO_HEIGHT (decoded_info),
+        "format", G_TYPE_STRING, format_str, NULL);
+    GST_INFO_OBJECT (decode, "new alloc caps = %" GST_PTR_FORMAT,
+        allocation_caps);
+  }
+  gst_caps_replace (&state->allocation_caps, allocation_caps);
+
   GST_INFO_OBJECT (decode, "new src caps = %" GST_PTR_FORMAT, state->caps);
   gst_caps_replace (&decode->srcpad_caps, state->caps);
   gst_video_codec_state_unref (state);
@@ -713,7 +731,6 @@ gst_vaapidecode_decide_allocation (GstVideoDecoder * vdec, GstQuery * query)
 {
   GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
   GstCaps *caps = NULL;
-  gboolean ret = FALSE;
 
   gst_query_parse_allocation (query, &caps, NULL);
   decode->has_texture_upload_meta = FALSE;
@@ -725,46 +742,8 @@ gst_vaapidecode_decide_allocation (GstVideoDecoder * vdec, GstQuery * query)
       GST_VAAPI_CAPS_FEATURE_GL_TEXTURE_UPLOAD_META);
 #endif
 
-  if (decode->do_pool_renego) {
-    caps = gst_caps_copy (caps);
-    /* Always use un-cropped dimension of decoded surface for pool negotiation */
-    gst_caps_set_simple (caps, "width", G_TYPE_INT,
-        GST_VIDEO_INFO_WIDTH (&decode->decoded_info), "height", G_TYPE_INT,
-        GST_VIDEO_INFO_HEIGHT (&decode->decoded_info), NULL);
-
-    ret =
-        gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (vdec),
-        query, 0, caps);
-
-    gst_caps_unref (caps);
-    decode->do_pool_renego = FALSE;
-  } else {
-    /* No need to renegotiate the pool, set the previously configured pool in query */
-    guint size, min, max;
-    GstStructure *config;
-    GstVaapiPluginBase *plugin = GST_VAAPI_PLUGIN_BASE (vdec);
-    GstBufferPool *pool = plugin->srcpad_buffer_pool;
-
-    if (G_UNLIKELY (!pool)) {
-      GST_ERROR ("Failed to find configured VaapiVideoBufferPool! ");
-      return ret;
-    }
-
-    config = gst_buffer_pool_get_config (pool);
-    if (!config
-        || !gst_buffer_pool_config_get_params (config, NULL, &size, &min, &max))
-      return ret;
-    gst_structure_free (config);
-
-    if (gst_query_get_n_allocation_pools (query) > 0)
-      gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
-    else
-      gst_query_add_allocation_pool (query, pool, size, min, max);
-
-    ret = TRUE;
-  }
-
-  return ret;
+  return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (vdec),
+      query, 0);
 }
 
 static inline gboolean

diff --git a/gst/vaapi/gstvaapipluginbase.c b/gst/vaapi/gstvaapipluginbase.c
index c2dc4c9..16cc449 100644 (file)
--- a/gst/vaapi/gstvaapipluginbase.c
+++ b/gst/vaapi/gstvaapipluginbase.c
@@ -587,8 +587,6 @@ gst_vaapi_plugin_base_set_pool_config (GstBufferPool * pool,
  * @query: the allocation query to parse
  * @feature: the desired #GstVaapiCapsFeature, or zero to find the
  *   preferred one
- * @preferred_caps: the desired #GstCaps, or NULL to find the
- *   preferred one from query
  *
  * Decides allocation parameters for the downstream elements.
  *
@@ -596,13 +594,12 @@ gst_vaapi_plugin_base_set_pool_config (GstBufferPool * pool,
  */
 gboolean
 gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
-    GstQuery * query, guint feature, GstCaps * preferred_caps)
+    GstQuery * query, guint feature)
 {
   GstCaps *caps = NULL;
   GstBufferPool *pool;
   GstStructure *config;
   GstVideoInfo vi;
-  GstQuery *old_query = NULL, *new_query = NULL;
   guint size, min, max;
   gboolean update_pool = FALSE;
   gboolean has_video_meta = FALSE;
@@ -614,16 +611,6 @@ gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
 
   g_return_val_if_fail (plugin->display != NULL, FALSE);
 
-  /* Make sure new caps get advertised to all downstream elements */
-  if (preferred_caps) {
-    new_query = gst_query_new_allocation (preferred_caps, TRUE);
-    if (!gst_pad_peer_query (GST_VAAPI_PLUGIN_BASE_SRC_PAD (plugin), new_query)) {
-      GST_DEBUG ("didn't get downstream ALLOCATION hints");
-    }
-    old_query = query;
-    query = new_query;
-  }
-
   gst_query_parse_allocation (query, &caps, NULL);
 
   /* We don't need any GL context beyond this point if not requested
@@ -671,7 +658,6 @@ gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
 
   gst_video_info_init (&vi);
   gst_video_info_from_caps (&vi, caps);
-
   if (GST_VIDEO_INFO_FORMAT (&vi) == GST_VIDEO_FORMAT_ENCODED)
     gst_video_info_set_format (&vi, GST_VIDEO_FORMAT_NV12,
         GST_VIDEO_INFO_WIDTH (&vi), GST_VIDEO_INFO_HEIGHT (&vi));
@@ -731,11 +717,6 @@ gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
   }
 #endif
 
-  if (old_query)
-    query = old_query;
-  if (new_query)
-    gst_query_unref (new_query);
-
   if (update_pool)
     gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max);
   else

diff --git a/gst/vaapi/gstvaapipluginbase.h b/gst/vaapi/gstvaapipluginbase.h
index 5be15ae..27c7491 100644 (file)
--- a/gst/vaapi/gstvaapipluginbase.h
+++ b/gst/vaapi/gstvaapipluginbase.h
@@ -213,7 +213,7 @@ gst_vaapi_plugin_base_propose_allocation (GstVaapiPluginBase * plugin,
 G_GNUC_INTERNAL
 gboolean
 gst_vaapi_plugin_base_decide_allocation (GstVaapiPluginBase * plugin,
-    GstQuery * query, guint feature, GstCaps *preferred_caps);
+    GstQuery * query, guint feature);
 
 G_GNUC_INTERNAL
 GstFlowReturn

diff --git a/gst/vaapi/gstvaapipostproc.c b/gst/vaapi/gstvaapipostproc.c
index 62deb0e..9d2dac7 100644 (file)
--- a/gst/vaapi/gstvaapipostproc.c
+++ b/gst/vaapi/gstvaapipostproc.c
@@ -1343,7 +1343,7 @@ static gboolean
 gst_vaapipostproc_decide_allocation (GstBaseTransform * trans, GstQuery * query)
 {
   return gst_vaapi_plugin_base_decide_allocation (GST_VAAPI_PLUGIN_BASE (trans),
-      query, 0, NULL);
+      query, 0);
 }
 
 static void