mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2src: avoid lists with one single framerate in probed caps

Browse source 
Simplify framerate field if possible, so we don't end up with
e.g. framerate = (fraction) { 30/1 }. Maybe the helper function
should be moved to core, but we can do this later.
This commit is contained in:
Tim-Philipp Müller 2014-05-12 17:20:14 +01:00
parent 420661bd95
commit f63bdd0483
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/v4l2/gstv4l2object.c
View file

@ -1557,6 +1557,25 @@ cropcap_failed:
goto done; goto done;
} }
/* returns TRUE if the value was changed in place, otherwise FALSE */
static gboolean
gst_v4l2src_value_simplify (GValue * val)
{
/* simplify list of one value to one value */
if (GST_VALUE_HOLDS_LIST (val) && gst_value_list_get_size (val) == 1) {
const GValue *list_val;
GValue new_val = G_VALUE_INIT;
list_val = gst_value_list_get_value (val, 0);
g_value_init (&new_val, G_VALUE_TYPE (list_val));
g_value_copy (list_val, &new_val);
g_value_unset (val);
*val = new_val;
return TRUE;
}
return FALSE;
}
/* The frame interval enumeration code first appeared in Linux 2.6.19. */ /* The frame interval enumeration code first appeared in Linux 2.6.19. */
static GstStructure * static GstStructure *
@ -1745,6 +1764,7 @@ return_data:
(interlaced ? "mixed" : "progressive"), NULL); (interlaced ? "mixed" : "progressive"), NULL);
if (G_IS_VALUE (&rates)) { if (G_IS_VALUE (&rates)) {
gst_v4l2src_value_simplify (&rates);
/* only change the framerate on the template when we have a valid probed new /* only change the framerate on the template when we have a valid probed new
* value */ * value */
gst_structure_set_value (s, "framerate", &rates); gst_structure_set_value (s, "framerate", &rates);