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

d/v4l2: Be more tolorant for long pipelines

Browse source
This commit is contained in:
Jakob Bornecrantz 2021-02-27 02:15:30 +00:00
parent d34e1464fd
commit 1155106dc1
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@
DEBUG_GET_ONCE_LOG_OPTION(v4l2_log, "V4L2_LOG", U_LOGGING_WARN) DEBUG_GET_ONCE_LOG_OPTION(v4l2_log, "V4L2_LOG", U_LOGGING_WARN)
DEBUG_GET_ONCE_NUM_OPTION(v4l2_exposure_absolute, "V4L2_EXPOSURE_ABSOLUTE", 10) DEBUG_GET_ONCE_NUM_OPTION(v4l2_exposure_absolute, "V4L2_EXPOSURE_ABSOLUTE", 10)
#define NUM_V4L2_BUFFERS 5 #define NUM_V4L2_BUFFERS 32
/* /*
@ -141,6 +141,7 @@ struct v4l2_fs
} quirks; } quirks;
struct v4l2_frame frames[NUM_V4L2_BUFFERS]; struct v4l2_frame frames[NUM_V4L2_BUFFERS];
uint32_t used_frames;
struct struct
{ {
@ -207,6 +208,8 @@ v4l2_free_frame(struct xrt_frame *xf)
struct v4l2_frame *vf = (struct v4l2_frame *)xf; struct v4l2_frame *vf = (struct v4l2_frame *)xf;
struct v4l2_fs *vid = (struct v4l2_fs *)xf->owner; struct v4l2_fs *vid = (struct v4l2_fs *)xf->owner;
vid->used_frames--;
if (!vid->is_running) { if (!vid->is_running) {
return; return;
} }
@ -891,6 +894,10 @@ v4l2_fs_stream_run(void *ptr)
v_buf.memory = v_bufrequest.memory; v_buf.memory = v_bufrequest.memory;
while (vid->is_running) { while (vid->is_running) {
if (vid->used_frames == NUM_V4L2_BUFFERS) {
V4L2_ERROR(vid, "No frames left");
}
if (ioctl(vid->fd, VIDIOC_DQBUF, &v_buf) < 0) { if (ioctl(vid->fd, VIDIOC_DQBUF, &v_buf) < 0) {
V4L2_ERROR(vid, "error: Dequeue failed!"); V4L2_ERROR(vid, "error: Dequeue failed!");
vid->is_running = false; vid->is_running = false;
@ -925,6 +932,8 @@ v4l2_fs_stream_run(void *ptr)
vid->sink->push_frame(vid->sink, xf); vid->sink->push_frame(vid->sink, xf);
vid->used_frames++;
// The frame is requeued as soon as the refcount reaches zero, // The frame is requeued as soon as the refcount reaches zero,
// this can be done safely from another thread. // this can be done safely from another thread.
xrt_frame_reference(&xf, NULL); xrt_frame_reference(&xf, NULL);