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

caps: Properly handle ANY caps features in caps operations

Browse source
This commit is contained in:
Sebastian Dröge 2013-04-06 21:09:49 +02:00
parent 627d111eb6
commit db6ee700f2
1 changed files with 61 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
gst/gstcaps.c
View file

@ -689,9 +689,9 @@ gst_caps_merge_structure (GstCaps * caps, GstStructure * structure)
/* if structure is a subset of structure1 and the /* if structure is a subset of structure1 and the
* there are no existing features, then skip it */ * there are no existing features, then skip it */
if (gst_structure_is_subset (structure, structure1) && if (gst_caps_features_is_equal (features1,
gst_caps_features_is_equal (features1, GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)
GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY)) { && gst_structure_is_subset (structure, structure1)) {
unique = FALSE; unique = FALSE;
break; break;
} }
@ -740,8 +740,15 @@ gst_caps_merge_structure_full (GstCaps * caps, GstStructure * structure,
features1 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; features1 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
/* if structure is a subset of structure1 and the /* if structure is a subset of structure1 and the
* the features are a subset, then skip it */ * the features are a subset, then skip it */
if (gst_structure_is_subset (structure, structure1) && /* FIXME: We only skip if none of the features are
gst_caps_features_is_equal (features_tmp, features1)) { * ANY and are still equal. That way all ANY structures
* show up in the caps and no non-ANY structures are
* swallowed by ANY structures
*/
if (((!gst_caps_features_is_any (features_tmp)
|| gst_caps_features_is_any (features1))
&& gst_caps_features_is_equal (features_tmp, features1))
&& gst_structure_is_subset (structure, structure1)) {
unique = FALSE; unique = FALSE;
break; break;
} }
@ -1178,8 +1185,9 @@ gst_caps_is_subset (const GstCaps * subset, const GstCaps * superset)
f2 = gst_caps_get_features_unchecked (superset, j); f2 = gst_caps_get_features_unchecked (superset, j);
if (!f2) if (!f2)
f2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; f2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
if (gst_structure_is_subset (s1, s2) && if ((!gst_caps_features_is_any (f1) || gst_caps_features_is_any (f2)) &&
gst_caps_features_is_equal (f1, f2)) { gst_caps_features_is_equal (f1, f2)
&& gst_structure_is_subset (s1, s2)) {
/* If we found a superset, continue with the next /* If we found a superset, continue with the next
* subset structure */ * subset structure */
break; break;
@ -1267,8 +1275,9 @@ gst_caps_is_subset_structure_full (const GstCaps * caps,
f = gst_caps_get_features_unchecked (caps, i); f = gst_caps_get_features_unchecked (caps, i);
if (!f) if (!f)
f = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; f = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
if (gst_structure_is_subset (structure, s) && if ((!gst_caps_features_is_any (features) || gst_caps_features_is_any (f))
gst_caps_features_is_equal (features, f)) { && gst_caps_features_is_equal (features, f)
&& gst_structure_is_subset (structure, s)) {
/* If we found a superset return TRUE */ /* If we found a superset return TRUE */
return TRUE; return TRUE;
} }
@ -1336,8 +1345,9 @@ gst_caps_is_strictly_equal (const GstCaps * caps1, const GstCaps * caps2)
if (!f2) if (!f2)
f2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; f2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
if (!gst_structure_is_equal (s1, s2) if (gst_caps_features_is_any (f1) != gst_caps_features_is_any (f2) ||
|| !gst_caps_features_is_equal (f1, f2)) !gst_caps_features_is_equal (f1, f2) ||
!gst_structure_is_equal (s1, s2))
return FALSE; return FALSE;
} }
@ -1417,8 +1427,8 @@ gst_caps_can_intersect (const GstCaps * caps1, const GstCaps * caps2)
features2 = gst_caps_get_features_unchecked (caps2, k); features2 = gst_caps_get_features_unchecked (caps2, k);
if (!features2) if (!features2)
features2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; features2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
if (gst_structure_can_intersect (struct1, struct2) && if (gst_caps_features_is_equal (features1, features2) &&
gst_caps_features_is_equal (features1, features2)) { gst_structure_can_intersect (struct1, struct2)) {
return TRUE; return TRUE;
} }
/* move down left */ /* move down left */
@ -1495,11 +1505,19 @@ gst_caps_intersect_zig_zag (GstCaps * caps1, GstCaps * caps2)
features2 = gst_caps_get_features_unchecked (caps2, k); features2 = gst_caps_get_features_unchecked (caps2, k);
if (!features2) if (!features2)
features2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; features2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
if (gst_caps_features_is_equal (features1, features2)) {
istruct = gst_structure_intersect (struct1, struct2); istruct = gst_structure_intersect (struct1, struct2);
if (istruct && gst_caps_features_is_equal (features1, features2)) if (istruct) {
if (gst_caps_features_is_any (features1))
dest =
gst_caps_merge_structure_full (dest, istruct,
gst_caps_features_copy_conditional (features2));
else
dest = dest =
gst_caps_merge_structure_full (dest, istruct, gst_caps_merge_structure_full (dest, istruct,
gst_caps_features_copy_conditional (features1)); gst_caps_features_copy_conditional (features1));
}
}
/* move down left */ /* move down left */
k++; k++;
if (G_UNLIKELY (j == 0)) if (G_UNLIKELY (j == 0))
@ -1563,9 +1581,19 @@ gst_caps_intersect_first (GstCaps * caps1, GstCaps * caps2)
features2 = gst_caps_get_features_unchecked (caps2, j); features2 = gst_caps_get_features_unchecked (caps2, j);
if (!features2) if (!features2)
features2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; features2 = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
if (gst_caps_features_is_equal (features1, features2)) {
istruct = gst_structure_intersect (struct1, struct2); istruct = gst_structure_intersect (struct1, struct2);
if (istruct && gst_caps_features_is_equal (features1, features2)) if (istruct) {
dest = gst_caps_merge_structure (dest, istruct); if (gst_caps_features_is_any (features1))
dest =
gst_caps_merge_structure_full (dest, istruct,
gst_caps_features_copy_conditional (features2));
else
dest =
gst_caps_merge_structure_full (dest, istruct,
gst_caps_features_copy_conditional (features1));
}
}
} }
} }
@ -1740,6 +1768,10 @@ gst_caps_subtract (GstCaps * minuend, GstCaps * subtrahend)
min_f = gst_caps_get_features_unchecked (src, j); min_f = gst_caps_get_features_unchecked (src, j);
if (!min_f) if (!min_f)
min_f = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY; min_f = GST_CAPS_FEATURES_MEMORY_SYSTEM_MEMORY;
/* Same reason as above for ANY caps */
g_return_val_if_fail (!gst_caps_features_is_any (min_f), NULL);
if (gst_structure_get_name_id (min) == gst_structure_get_name_id (sub) && if (gst_structure_get_name_id (min) == gst_structure_get_name_id (sub) &&
gst_caps_features_is_equal (min_f, sub_f)) { gst_caps_features_is_equal (min_f, sub_f)) {
GSList *list; GSList *list;
@ -2052,6 +2084,7 @@ GstCaps *
gst_caps_fixate (GstCaps * caps) gst_caps_fixate (GstCaps * caps)
{ {
GstStructure *s; GstStructure *s;
GstCapsFeatures *f;
g_return_val_if_fail (GST_IS_CAPS (caps), NULL); g_return_val_if_fail (GST_IS_CAPS (caps), NULL);
@ -2061,6 +2094,13 @@ gst_caps_fixate (GstCaps * caps)
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);
gst_structure_fixate (s); gst_structure_fixate (s);
/* Set features to sysmem if they're still ANY */
f = gst_caps_get_features (caps, 0);
if (f && gst_caps_features_is_any (f)) {
f = gst_caps_features_new_empty ();
gst_caps_set_features (caps, 0, f);
}
return caps; return caps;
} }