mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-06 07:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/v4l2: Factor out format setup so we can catch errors in stream_start

Browse source
This commit is contained in:
Moses Turner 2022-06-30 15:19:51 +01:00
parent 2cbad30823
commit 567304374d
1 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/xrt/drivers/v4l2/v4l2_driver.c
View file

@ -611,6 +611,36 @@ v4l2_update_controls(struct v4l2_fs *vid)
} }
bool
v4l2_fs_setup_format(struct v4l2_fs *vid)
{
if (vid->fd == -1) {
V4L2_ERROR(vid, "error: Device not opened!");
return false;
}
struct v4l2_source_descriptor *desc = &vid->descriptors[vid->selected];
struct v4l2_format v_format;
U_ZERO(&v_format);
v_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
v_format.fmt.pix.width = desc->stream.width;
v_format.fmt.pix.height = desc->stream.height;
v_format.fmt.pix.pixelformat = desc->stream.format;
v_format.fmt.pix.field = V4L2_FIELD_ANY;
if (vid->has.extended_format) {
v_format.fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
}
if (ioctl(vid->fd, VIDIOC_S_FMT, &v_format) < 0) {
V4L2_ERROR(vid, "Could not set up format!");
return false;
}
return true;
}
/* /*
* *
* Exported functions. * Exported functions.
@ -665,6 +695,12 @@ v4l2_fs_stream_start(struct xrt_fs *xfs,
vid->sink = xs; vid->sink = xs;
vid->is_running = true; vid->is_running = true;
vid->capture_type = capture_type; vid->capture_type = capture_type;
if (!v4l2_fs_setup_format(vid)) {
vid->is_running = false;
return false;
}
if (pthread_create(&vid->stream_thread, NULL, v4l2_fs_mainloop, xfs)) { if (pthread_create(&vid->stream_thread, NULL, v4l2_fs_mainloop, xfs)) {
vid->is_running = false; vid->is_running = false;
V4L2_ERROR(vid, "error: Could not create thread"); V4L2_ERROR(vid, "error: Could not create thread");
@ -818,26 +854,8 @@ v4l2_fs_mainloop(void *ptr)
return NULL; return NULL;
} }
// set up our capture format
struct v4l2_source_descriptor *desc = &vid->descriptors[vid->selected]; struct v4l2_source_descriptor *desc = &vid->descriptors[vid->selected];
struct v4l2_format v_format;
U_ZERO(&v_format);
v_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
v_format.fmt.pix.width = desc->stream.width;
v_format.fmt.pix.height = desc->stream.height;
v_format.fmt.pix.pixelformat = desc->stream.format;
v_format.fmt.pix.field = V4L2_FIELD_ANY;
if (vid->has.extended_format) {
v_format.fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
}
if (ioctl(vid->fd, VIDIOC_S_FMT, &v_format) < 0) {
V4L2_ERROR(vid, "could not set up format!");
return NULL;
}
// set up our buffers - prefer userptr (client alloc) vs mmap (kernel // set up our buffers - prefer userptr (client alloc) vs mmap (kernel
// alloc) // alloc)
// TODO: using buffer caps may be better than 'fallthrough to mmap' // TODO: using buffer caps may be better than 'fallthrough to mmap'