mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

vavpp: simplify gst_va_vpp_transform_caps()

Browse source 
The code is simplified by using GQuarks for looking for caps features, and
removing inner loops.

Also, it's used the pad template caps to compare with the incoming caps because
is cheaper at the beginning of negotiation, where the pad template caps is used.
And, since the ANY caps where removed, there's no need to check for an initial
intersection.

Finally, the completion of caps features is done through a loop.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6698>
This commit is contained in:
Víctor Manuel Jáquez Leal 2024-07-02 13:00:14 +02:00 committed by GStreamer Marge Bot
parent 9f1887a623
commit 426616cca7
1 changed files with 45 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -934,7 +934,12 @@ gst_va_vpp_caps_remove_fields (GstCaps * caps)
GstCaps *ret;
GstStructure *structure;
GstCapsFeatures *features;
gint i, j, n, m;
gint i, n;
guint sysmem, dmabuf, va;
sysmem = g_quark_from_static_string (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
dmabuf = g_quark_from_static_string (GST_CAPS_FEATURE_MEMORY_DMABUF);
va = g_quark_from_static_string (GST_CAPS_FEATURE_MEMORY_VA);
ret = gst_caps_new_empty ();
@ -950,14 +955,9 @@ gst_va_vpp_caps_remove_fields (GstCaps * caps)
structure = gst_structure_copy (structure);
m = gst_caps_features_get_size (features);
for (j = 0; j < m; j++) {
const gchar *feature = gst_caps_features_get_nth (features, j);
if (g_strcmp0 (feature, GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY) == 0
|| g_strcmp0 (feature, GST_CAPS_FEATURE_MEMORY_DMABUF) == 0
|| g_strcmp0 (feature, GST_CAPS_FEATURE_MEMORY_VA) == 0) {
if (gst_caps_features_contains_id (features, sysmem)
|| gst_caps_features_contains_id (features, dmabuf)
|| gst_caps_features_contains_id (features, va)) {
/* rangify frame size */
gst_structure_set (structure, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
@ -971,9 +971,6 @@ gst_va_vpp_caps_remove_fields (GstCaps * caps)
/* remove format-related fields */
gst_structure_remove_fields (structure, "format", "drm-format",
"colorimetry", "chroma-site", NULL);
break;
}
}
gst_caps_append_structure_full (ret, structure,
@ -989,7 +986,7 @@ static GstCaps *
gst_va_vpp_complete_caps_features (const GstCaps * caps,
const gchar * feature_name)
{
guint i, j, m, n;
guint i, n;
GstCaps *tmp;
tmp = gst_caps_new_empty ();
@ -997,24 +994,19 @@ gst_va_vpp_complete_caps_features (const GstCaps * caps,
n = gst_caps_get_size (caps);
for (i = 0; i < n; i++) {
GstCapsFeatures *features, *orig_features;
GstStructure *s = gst_caps_get_structure (caps, i);
gboolean contained = FALSE;
GstStructure *s;
s = gst_caps_get_structure (caps, i);
orig_features = gst_caps_get_features (caps, i);
if (gst_caps_features_contains (orig_features, feature_name)) {
gst_caps_append_structure_full (tmp, gst_structure_copy (s),
gst_caps_features_copy (orig_features));
continue;
}
features = gst_caps_features_new (feature_name, NULL);
m = gst_caps_features_get_size (orig_features);
for (j = 0; j < m; j++) {
const gchar *feature = gst_caps_features_get_nth (orig_features, j);
/* if we already have the features */
if (gst_caps_features_contains (features, feature)) {
contained = TRUE;
break;
}
}
if (!contained && !gst_caps_is_subset_structure_full (tmp, s, features))
if (!gst_caps_is_subset_structure_full (tmp, s, features))
gst_caps_append_structure_full (tmp, gst_structure_copy (s), features);
else
gst_caps_features_free (features);
@ -1028,40 +1020,33 @@ gst_va_vpp_transform_caps (GstBaseTransform * trans, GstPadDirection direction,
GstCaps * caps, GstCaps * filter)
{
GstVaVpp *self = GST_VA_VPP (trans);
GstVaBaseTransform *btrans = GST_VA_BASE_TRANSFORM (trans);
GstCaps *ret, *tmp, *filter_caps;
GstCaps *ret;
GstPadTemplate *pad_tmpl;
static const gchar *caps_features[] = { GST_CAPS_FEATURE_MEMORY_VA,
GST_CAPS_FEATURE_MEMORY_DMABUF, GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY
};
guint i;
GST_DEBUG_OBJECT (self,
"Transforming caps %" GST_PTR_FORMAT " in direction %s", caps,
(direction == GST_PAD_SINK) ? "sink" : "src");
filter_caps = gst_va_base_transform_get_filter_caps (btrans);
if (filter_caps && !gst_caps_can_intersect (caps, filter_caps)) {
pad_tmpl = gst_element_get_pad_template (GST_ELEMENT (self),
(direction == GST_PAD_SINK) ? "sink" : "src");
if (pad_tmpl->caps == caps) {
ret = gst_caps_ref (caps);
goto bail;
}
ret = gst_va_vpp_caps_remove_fields (caps);
tmp = gst_va_vpp_complete_caps_features (ret, GST_CAPS_FEATURE_MEMORY_VA);
if (!gst_caps_is_subset (tmp, ret)) {
gst_caps_append (ret, tmp);
} else {
gst_caps_unref (tmp);
}
for (i = 0; i < G_N_ELEMENTS (caps_features); i++) {
GstCaps *tmp;
tmp = gst_va_vpp_complete_caps_features (ret, GST_CAPS_FEATURE_MEMORY_DMABUF);
if (!gst_caps_is_subset (tmp, ret)) {
tmp = gst_va_vpp_complete_caps_features (ret, caps_features[i]);
if (!gst_caps_is_subset (tmp, ret))
gst_caps_append (ret, tmp);
} else {
gst_caps_unref (tmp);
}
tmp = gst_va_vpp_complete_caps_features (ret,
GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
if (!gst_caps_is_subset (tmp, ret)) {
gst_caps_append (ret, tmp);
} else {
else
gst_caps_unref (tmp);
}