mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-09 05:38:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	sys/v4l2/v4l2src_calls.c
This commit is contained in:
Wim Taymans 2011-08-29 13:43:59 +02:00
commit 5b55cf057b
1 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/v4l2/gstv4l2object.c
View file

@ -2291,9 +2291,11 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, GstCaps * caps)
streamparm.parm.capture.timeperframe.denominator,
streamparm.parm.capture.timeperframe.numerator);
/* Note: V4L2 provides the frame interval, we have the frame rate */
if (!fractions_are_equal (streamparm.parm.capture.timeperframe.numerator,
streamparm.parm.capture.timeperframe.denominator, fps_d, fps_n)) {
/* We used to skip frame rate setup if the camera was already setup
* with the requested frame rate. This breaks some cameras though,
* causing them to not output data (several models of Thinkpad cameras
* have this problem at least).
* So, don't skip. */
GST_LOG_OBJECT (v4l2object->element, "Setting framerate to %u/%u", fps_n,
fps_d);
/* We want to change the frame rate, so check whether we can. Some cheap USB
@ -2322,7 +2324,6 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, GstCaps * caps)
GST_VIDEO_INFO_FPS_N (&info) = fps_n;
GST_VIDEO_INFO_FPS_D (&info) = fps_d;
}
}
done:
/* if we have a framerate pre-calculate duration */