diff options
| author | Paul Elder <paul.elder@ideasonboard.com> | 2020-06-04 22:33:24 +0900 |
|---|---|---|
| committer | Paul Elder <paul.elder@ideasonboard.com> | 2020-06-08 17:11:49 +0900 |
| commit | 071e3698f56522726f2ba1aeeade44d6c6c4f7f8 (patch) | |
| tree | f2af4f7993948f1597155753832640878019c768 | |
| parent | 8df593841dc81a015906f8273eccd3de2c99f5ca (diff) | |
v4l2: v4l2_camera_proxy: Fix segfault on restarting streams
The V4L2 compatibility layer keeps track of the index of the next buffer
to be dequeued, to handle VIDIOC_DQBUF. This index is set to 0 on
startup and incremented (modulo #frames), and is otherwise never reset.
This means that if the last handled frame index is not #frames-1, and
the stream is restarted without restarting libcamera and the V4L2
compatilibity layer, the buffer index number won't match with the
libcamera buffer index number, causing a segfault. Fix this by resetting
the current buffer index to zero on VIDIOC_STREAMON.
Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
| -rw-r--r-- | src/v4l2/v4l2_camera_proxy.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 7ee4c0cb..059f3cbe 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -465,6 +465,8 @@ int V4L2CameraProxy::vidioc_streamon(int *arg) if (!validateBufferType(*arg)) return -EINVAL; + currentBuf_ = 0; + return vcam_->streamOn(); } |