mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gststructure: inline gst_structure_is_subset()

Browse source 
Having direct access to the iteration allows tighter code and
also being able to stop earlier.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/453>
This commit is contained in:
Edward Hervey 2020-03-23 08:10:53 +01:00 committed by Sebastian Dröge
parent 586454bf10
commit 7e1a0ed604
1 changed files with 43 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
gst/gststructure.c
View file

@ -3111,30 +3111,6 @@ gst_structure_can_intersect (const GstStructure * struct1,
gst_caps_structure_can_intersect_field, (gpointer) struct2); gst_caps_structure_can_intersect_field, (gpointer) struct2);
} }
static gboolean
gst_caps_structure_is_superset_field (GQuark field_id, const GValue * value,
gpointer user_data)
{
GstStructure *subset = user_data;
const GValue *other;
int comparison;
if (!(other = gst_structure_id_get_value (subset, field_id)))
/* field is missing in the subset => no subset */
return FALSE;
comparison = gst_value_compare (value, other);
/* equal values are subset */
if (comparison == GST_VALUE_EQUAL)
return TRUE;
/* ordered, but unequal, values are not */
if (comparison != GST_VALUE_UNORDERED)
return FALSE;
return gst_value_is_subset (other, value);
}
/** /**
* gst_structure_is_subset: * gst_structure_is_subset:
@ -3151,12 +3127,51 @@ gboolean
gst_structure_is_subset (const GstStructure * subset, gst_structure_is_subset (const GstStructure * subset,
const GstStructure * superset) const GstStructure * superset)
{ {
if ((superset->name != subset->name) || guint it1, len1, it2, len2;
(gst_structure_n_fields (superset) > gst_structure_n_fields (subset)))
g_assert (superset);
if (G_UNLIKELY (superset->name != subset->name))
return FALSE; return FALSE;
return gst_structure_foreach ((GstStructure *) superset, len1 = GST_STRUCTURE_LEN (subset);
gst_caps_structure_is_superset_field, (gpointer) subset); len2 = GST_STRUCTURE_LEN (superset);
if (len2 > len1)
return FALSE;
for (it2 = 0; it2 < len2; it2++) {
GstStructureField *superfield = GST_STRUCTURE_FIELD (superset, it2);
gboolean seenother = FALSE;
for (it1 = 0; it1 < len1; it1++) {
GstStructureField *subfield = GST_STRUCTURE_FIELD (subset, it1);
if (subfield->name == superfield->name) {
int comparison =
gst_value_compare (&subfield->value, &superfield->value);
seenother = TRUE;
/* If present and equal, stop iterating */
if (comparison == GST_VALUE_EQUAL)
break;
/* Stop everything if ordered but unequal */
if (comparison != GST_VALUE_UNORDERED)
return FALSE;
/* Stop everything if not a subset */
if (!gst_value_is_subset (&subfield->value, &superfield->value))
return FALSE;
break;
}
}
/* We did not see superfield in subfield */
if (!seenother)
return FALSE;
}
/* We saw everything from subset in the superset */
return TRUE;
} }