mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 05:16:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstvalue: Optimize gst_value_compare_list

Browse source 
The compare function only needs to be retrieved once and used
directly

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/453>
This commit is contained in:
Edward Hervey 2020-03-23 17:01:20 +01:00 committed by Sebastian Dröge
parent ee4d2f9178
commit 46449cbb76
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gst/gstvalue.c
View file

@ -1139,6 +1139,18 @@ gst_value_compare_value_list (const GValue * value1, const GValue * value2)
if (len != vlist2->len)
return GST_VALUE_UNORDERED;
/* Empty lists are equal */
if (len == 0)
return GST_VALUE_EQUAL;
/* We know lists are not empty. do sanity check on first values */
if (G_VALUE_TYPE (&vlist1->fields[0]) != G_VALUE_TYPE (&vlist2->fields[0]))
return GST_VALUE_UNORDERED;
/* Get the compare function */
if (!(compare = gst_value_get_compare_func (&vlist1->fields[0])))
return GST_VALUE_UNORDERED;
/* place to mark removed value indices of array2 */
removed = g_newa (guint8, len);
memset (removed, 0, len);
@ -1148,24 +1160,24 @@ gst_value_compare_value_list (const GValue * value1, const GValue * value2)
* item in array2, remove it from array2 by marking it as removed */
for (i = 0; i < len; i++) {
v1 = &vlist1->fields[i];
if ((compare = gst_value_get_compare_func (v1))) {
for (j = 0; j < len; j++) {
/* item is removed, we can skip it */
if (removed[j])
continue;
v2 = &vlist2->fields[j];
if (gst_value_compare_with_func (v1, v2, compare) == GST_VALUE_EQUAL) {
/* mark item as removed now that we found it in array2 and
* decrement the number of remaining items in array2. */
removed[j] = 1;
to_remove--;
break;
}
for (j = 0; j < len; j++) {
/* item is removed, we can skip it */
if (removed[j])
continue;
v2 = &vlist2->fields[j];
/* Note: compare function can be called directly since we know the types
* are identical */
if (compare (v1, v2) == GST_VALUE_EQUAL) {
/* mark item as removed now that we found it in array2 and
* decrement the number of remaining items in array2. */
removed[j] = 1;
to_remove--;
break;
}
/* item in array1 and not in array2, UNORDERED */
if (j == len)
return GST_VALUE_UNORDERED;
} else
}
/* item in array1 and not in array2, UNORDERED */
if (j == len)
return GST_VALUE_UNORDERED;
}
/* if not all items were removed, array2 contained something not in array1 */