mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 07:58:51 +00:00
Use a helper function to swap prop entries such they are properly ordered by flexibility. This is important now that...
Original commit message from CVS: Use a helper function to swap prop entries such they are properly ordered by flexibility. This is important now that framerate is specified as a list of floats AND as a float range.
This commit is contained in:
parent
5d3c78427c
commit
71921dd910
1 changed files with 32 additions and 10 deletions
|
@ -2133,25 +2133,38 @@ end:
|
||||||
return compatible;
|
return compatible;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gint
|
||||||
|
_props_entry_flexibility (GstPropsEntry *entry)
|
||||||
|
{
|
||||||
|
gint rank;
|
||||||
|
switch (entry->propstype) {
|
||||||
|
default:
|
||||||
|
rank = 0;
|
||||||
|
break;
|
||||||
|
case GST_PROPS_INT_RANGE_TYPE:
|
||||||
|
rank = 1;
|
||||||
|
break;
|
||||||
|
case GST_PROPS_FLOAT_RANGE_TYPE:
|
||||||
|
rank = 2;
|
||||||
|
break;
|
||||||
|
case GST_PROPS_LIST_TYPE:
|
||||||
|
rank = 3;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return rank;
|
||||||
|
}
|
||||||
|
|
||||||
static GstPropsEntry*
|
static GstPropsEntry*
|
||||||
gst_props_entry_intersect (GstPropsEntry *entry1, GstPropsEntry *entry2)
|
gst_props_entry_intersect (GstPropsEntry *entry1, GstPropsEntry *entry2)
|
||||||
{
|
{
|
||||||
GstPropsEntry *result = NULL;
|
GstPropsEntry *result = NULL;
|
||||||
|
|
||||||
/* try to move the ranges and lists first */
|
/* Swap more flexible types into entry1 */
|
||||||
switch (entry2->propstype) {
|
if (_props_entry_flexibility (entry1) < _props_entry_flexibility (entry2)) {
|
||||||
case GST_PROPS_INT_RANGE_TYPE:
|
|
||||||
case GST_PROPS_FLOAT_RANGE_TYPE:
|
|
||||||
case GST_PROPS_LIST_TYPE:
|
|
||||||
{
|
|
||||||
GstPropsEntry *temp;
|
GstPropsEntry *temp;
|
||||||
|
|
||||||
temp = entry1;
|
temp = entry1;
|
||||||
entry1 = entry2;
|
entry1 = entry2;
|
||||||
entry2 = temp;
|
entry2 = temp;
|
||||||
}
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (entry1->propstype) {
|
switch (entry1->propstype) {
|
||||||
|
@ -2349,6 +2362,15 @@ gst_props_entry_intersect (GstPropsEntry *entry1, GstPropsEntry *entry2)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* make caps debugging extremely verbose
|
||||||
|
|
||||||
|
GST_CAT_DEBUG (GST_CAT_CAPS, "intersecting %s: %s x %s => %s",
|
||||||
|
g_quark_to_string (entry1->propid),
|
||||||
|
gst_props_entry_to_string (entry1),
|
||||||
|
gst_props_entry_to_string (entry2),
|
||||||
|
result? gst_props_entry_to_string (result) : "fail");
|
||||||
|
*/
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue