mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 18:05:37 +00:00
v4l2src: do not try to change device format if it's already correct
This allows set_caps to succeed if caps change in a way that would not modify the format we're getting from the hardware. Otherwise if not in NULL state, setting caps would fail with EBUSY. With this change, in some cases it's OK to go PLAYING->READY->PLAYING rather than PLAYING->NULL->PLAYING to avoid a time-consuming close and reopen of the device. Fixes #621723
This commit is contained in:
parent
9b9f9d0a2a
commit
f06b105058
1 changed files with 16 additions and 0 deletions
|
@ -1869,6 +1869,22 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, guint32 pixelformat,
|
|||
if (v4l2_ioctl (fd, VIDIOC_G_FMT, &format) < 0)
|
||||
goto get_fmt_failed;
|
||||
|
||||
if (format.type == v4l2object->type &&
|
||||
format.fmt.pix.width == width &&
|
||||
format.fmt.pix.height == height &&
|
||||
format.fmt.pix.pixelformat == pixelformat) {
|
||||
/* Nothing to do. We want to succeed immediately
|
||||
* here because setting the same format back
|
||||
* can still fail due to EBUSY. By short-circuiting
|
||||
* here, we allow pausing and re-playing pipelines
|
||||
* with changed caps, as long as the changed caps
|
||||
* do not change the webcam's format. Otherwise,
|
||||
* any caps change would require us to go to NULL
|
||||
* state to close the device and set format.
|
||||
*/
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
format.type = v4l2object->type;
|
||||
format.fmt.pix.width = width;
|
||||
format.fmt.pix.height = height;
|
||||
|
|
Loading…
Reference in a new issue