mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 13:38:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2: init datastructures after pre-conditions checks

Browse source
This commit is contained in:
Stefan Kost 2010-02-16 10:11:40 +02:00
parent 45522aab46
commit f94bfc65a5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/v4l2/gstv4l2object.c
View file

@ -1860,12 +1860,12 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, guint32 pixelformat,
GST_V4L2_CHECK_OPEN (v4l2object); GST_V4L2_CHECK_OPEN (v4l2object);
GST_V4L2_CHECK_NOT_ACTIVE (v4l2object); GST_V4L2_CHECK_NOT_ACTIVE (v4l2object);
memset (&format, 0x00, sizeof (struct v4l2_format));
format.type = v4l2object->type;
if (pixelformat == GST_MAKE_FOURCC ('M', 'P', 'E', 'G')) if (pixelformat == GST_MAKE_FOURCC ('M', 'P', 'E', 'G'))
return TRUE; return TRUE;
memset (&format, 0x00, sizeof (struct v4l2_format));
format.type = v4l2object->type;
if (v4l2_ioctl (fd, VIDIOC_G_FMT, &format) < 0) if (v4l2_ioctl (fd, VIDIOC_G_FMT, &format) < 0)
goto get_fmt_failed; goto get_fmt_failed;
@ -1873,12 +1873,13 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, guint32 pixelformat,
format.fmt.pix.width = width; format.fmt.pix.width = width;
format.fmt.pix.height = height; format.fmt.pix.height = height;
format.fmt.pix.pixelformat = pixelformat; format.fmt.pix.pixelformat = pixelformat;
/* request whole frames; change when gstreamer supports interlaced video /* FIXME: request whole frames; need to use gstreamer interlace support
* (INTERLACED mode returns frames where the fields have already been * (INTERLACED mode returns frames where the fields have already been
* combined, there are other modes for requesting fields individually) */ * combined, there are other modes for requesting fields individually) */
format.fmt.pix.field = V4L2_FIELD_INTERLACED; format.fmt.pix.field = V4L2_FIELD_INTERLACED;
if (v4l2_ioctl (fd, VIDIOC_S_FMT, &format) < 0) { if (v4l2_ioctl (fd, VIDIOC_S_FMT, &format) < 0) {
/* we might also get EBUSY here */
if (errno != EINVAL) if (errno != EINVAL)
goto set_fmt_failed; goto set_fmt_failed;