mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

vapostproc: Split caps transform in two phases.

Browse source 
In order to make more readable the caps transformation, the operation
was split in two phases:

1. Rangify the supported caps structures.
2. Add the missing (and supported) caps features.

Step 1 modified its logic, by copying any unrecognized structure.
It's a previous step required for allowing ANY caps feature as
passthrough.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1024>
This commit is contained in:
Víctor Manuel Jáquez Leal 2021-10-11 18:57:48 +02:00 committed by GStreamer Marge Bot
parent 6bf36f6e0f
commit d12991c979
1 changed files with 64 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
subprojects/gst-plugins-bad/sys/va/gstvavpp.c
View file

@ -769,21 +769,22 @@ gst_va_vpp_transform_meta (GstBaseTransform * trans, GstBuffer * inbuf,
return FALSE; return FALSE;
} }
/* Remove all the info for the cases when we can actually convert: /* In structures with supported caps features it's:
* Delete all the video "format", rangify the resolution size, also * + Rangified resolution size.
* remove "colorimetry", "chroma-site" and "pixel-aspect-ratio". All * + Rangified "pixel-aspect-ratio" if present.
* the missing caps features should be added based on the template, * + Removed "format", "colorimetry", "chroma-site"
* and the caps features' order in @caps is kept */ *
* Structures with unsupported caps features are copied as-is.
*/
static GstCaps * static GstCaps *
gst_va_vpp_complete_caps_features (GstCaps * caps, GstCaps * tmpl_caps) gst_va_vpp_caps_remove_fields (GstCaps * caps)
{ {
GstCaps *ret, *full_caps; GstCaps *ret;
GstStructure *structure; GstStructure *structure;
GstCapsFeatures *features; GstCapsFeatures *features;
gboolean has_sys_mem = FALSE, has_dma = FALSE, has_va = FALSE;
gint i, n; gint i, n;
full_caps = gst_caps_new_empty (); ret = gst_caps_new_empty ();
n = gst_caps_get_size (caps); n = gst_caps_get_size (caps);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -792,48 +793,61 @@ gst_va_vpp_complete_caps_features (GstCaps * caps, GstCaps * tmpl_caps)
/* If this is already expressed by the existing caps /* If this is already expressed by the existing caps
* skip this structure */ * skip this structure */
if (i > 0 if (i > 0 && gst_caps_is_subset_structure_full (ret, structure, features))
&& gst_caps_is_subset_structure_full (full_caps, structure, features))
continue; continue;
if (gst_caps_features_is_any (features))
continue;
if (gst_caps_features_is_equal (features,
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)) {
has_sys_mem = TRUE;
} else {
gboolean valid = FALSE;
if (gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF)) {
has_dma = TRUE;
valid = TRUE;
}
if (gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_VA)) {
has_va = TRUE;
valid = TRUE;
}
/* Not contain our supported feature */
if (!valid)
continue;
}
structure = gst_structure_copy (structure); structure = gst_structure_copy (structure);
gst_structure_set (structure, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT, if (gst_caps_features_is_equal (features,
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)
/* if pixel aspect ratio, make a range of it */ || gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_DMABUF)
if (gst_structure_has_field (structure, "pixel-aspect-ratio")) { || gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_VA)) {
gst_structure_set (structure, "pixel-aspect-ratio", /* rangify frame size */
GST_TYPE_FRACTION_RANGE, 1, G_MAXINT, G_MAXINT, 1, NULL); gst_structure_set (structure, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
} "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
gst_structure_remove_fields (structure, "format", "colorimetry",
"chroma-site", NULL);
gst_caps_append_structure_full (full_caps, structure, /* if pixel aspect ratio, make a range of it */
if (gst_structure_has_field (structure, "pixel-aspect-ratio")) {
gst_structure_set (structure, "pixel-aspect-ratio",
GST_TYPE_FRACTION_RANGE, 1, G_MAXINT, G_MAXINT, 1, NULL);
}
/* remove format-related fields */
gst_structure_remove_fields (structure, "format", "colorimetry",
"chroma-site", NULL);
}
gst_caps_append_structure_full (ret, structure,
gst_caps_features_copy (features)); gst_caps_features_copy (features));
} }
return ret;
}
/* All missing caps features should be added based on the template,
* and the caps features' order in @caps are kept */
static void
gst_va_vpp_complete_caps_features (GstCaps * caps, GstCaps * tmpl_caps)
{
GstStructure *structure;
GstCapsFeatures *features;
gboolean has_sys = FALSE, has_dma = FALSE, has_va = FALSE;
gint i, n;
n = gst_caps_get_size (caps);
for (i = 0; i < n; i++) {
features = gst_caps_get_features (caps, i);
if (gst_caps_features_is_equal (features,
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY))
has_sys = TRUE;
else if (gst_caps_features_contains (features, GST_CAPS_FEATURE_MEMORY_VA))
has_va = TRUE;
else if (gst_caps_features_contains (features,
GST_CAPS_FEATURE_MEMORY_DMABUF))
has_dma = TRUE;
}
/* Adding the missing features. */ /* Adding the missing features. */
n = gst_caps_get_size (tmpl_caps); n = gst_caps_get_size (tmpl_caps);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -842,25 +856,19 @@ gst_va_vpp_complete_caps_features (GstCaps * caps, GstCaps * tmpl_caps)
if (gst_caps_features_contains (features, if (gst_caps_features_contains (features,
GST_CAPS_FEATURE_MEMORY_VA) && !has_va) GST_CAPS_FEATURE_MEMORY_VA) && !has_va)
gst_caps_append_structure_full (full_caps, gst_structure_copy (structure), gst_caps_append_structure_full (caps, gst_structure_copy (structure),
gst_caps_features_copy (features)); gst_caps_features_copy (features));
if (gst_caps_features_contains (features, if (gst_caps_features_contains (features,
GST_CAPS_FEATURE_MEMORY_DMABUF) && !has_dma) GST_CAPS_FEATURE_MEMORY_DMABUF) && !has_dma)
gst_caps_append_structure_full (full_caps, gst_structure_copy (structure), gst_caps_append_structure_full (caps, gst_structure_copy (structure),
gst_caps_features_copy (features)); gst_caps_features_copy (features));
if (gst_caps_features_is_equal (features, if (gst_caps_features_is_equal (features,
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY) && !has_sys_mem) GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY) && !has_sys)
gst_caps_append_structure_full (full_caps, gst_structure_copy (structure), gst_caps_append_structure_full (caps, gst_structure_copy (structure),
gst_caps_features_copy (features)); gst_caps_features_copy (features));
} }
ret = gst_caps_intersect_full (full_caps, tmpl_caps,
GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (full_caps);
return ret;
} }
static GstCaps * static GstCaps *
@ -874,6 +882,8 @@ gst_va_vpp_transform_caps (GstBaseTransform * trans, GstPadDirection direction,
"Transforming caps %" GST_PTR_FORMAT " in direction %s", caps, "Transforming caps %" GST_PTR_FORMAT " in direction %s", caps,
(direction == GST_PAD_SINK) ? "sink" : "src"); (direction == GST_PAD_SINK) ? "sink" : "src");
ret = gst_va_vpp_caps_remove_fields (caps);
if (direction == GST_PAD_SINK) { if (direction == GST_PAD_SINK) {
tmpl_caps = tmpl_caps =
gst_pad_get_pad_template_caps (GST_BASE_TRANSFORM_SRC_PAD (trans)); gst_pad_get_pad_template_caps (GST_BASE_TRANSFORM_SRC_PAD (trans));
@ -882,8 +892,7 @@ gst_va_vpp_transform_caps (GstBaseTransform * trans, GstPadDirection direction,
gst_pad_get_pad_template_caps (GST_BASE_TRANSFORM_SINK_PAD (trans)); gst_pad_get_pad_template_caps (GST_BASE_TRANSFORM_SINK_PAD (trans));
} }
ret = gst_va_vpp_complete_caps_features (caps, tmpl_caps); gst_va_vpp_complete_caps_features (ret, tmpl_caps);
gst_caps_unref (tmpl_caps); gst_caps_unref (tmpl_caps);
if (filter) { if (filter) {