PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: v4l2_videodevice: Better tracking of the device state

Browse Source 
Replace the existing streaming_ state variable with an enum to track the
following three state: Streaming, Stopping, and Stopped. The alternate states
will be used in a subsequent commit.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck
2022-03-25 09:09:00 +00:00
committed by Laurent Pinchart
parent ec173ef5d3
commit 988ec3f417
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/libcamera/internal/v4l2_videodevice.h
View File

@@ -225,6 +225,12 @@ protected:
private:
LIBCAMERA_DISABLE_COPY(V4L2VideoDevice)
enum class State {
Streaming,
Stopping,
Stopped,
};
int getFormatMeta(V4L2DeviceFormat *format);
int trySetFormatMeta(V4L2DeviceFormat *format, bool set);
@@ -258,7 +264,7 @@ private:
EventNotifier *fdBufferNotifier_;
bool streaming_;
State state_;
};
class V4L2M2MDevice

10
src/libcamera/v4l2_videodevice.cpp
View File

@@ -507,7 +507,7 @@ const std::string V4L2DeviceFormat::toString() const
*/
V4L2VideoDevice::V4L2VideoDevice(const std::string &deviceNode)
: V4L2Device(deviceNode), formatInfo_(nullptr), cache_(nullptr),
fdBufferNotifier_(nullptr), streaming_(false)
fdBufferNotifier_(nullptr), state_(State::Stopped)
{
/*
* We default to an MMAP based CAPTURE video device, however this will
@@ -1803,7 +1803,7 @@ int V4L2VideoDevice::streamOn()
return ret;
}
streaming_ = true;
state_ = State::Streaming;
return 0;
}
@@ -1825,7 +1825,7 @@ int V4L2VideoDevice::streamOff()
{
int ret;
if (!streaming_ && queuedBuffers_.empty())
if (state_ != State::Streaming && queuedBuffers_.empty())
return 0;
ret = ioctl(VIDIOC_STREAMOFF, &bufferType_);
@@ -1835,6 +1835,8 @@ int V4L2VideoDevice::streamOff()
return ret;
}
state_ = State::Stopping;
/* Send back all queued buffers. */
for (auto it : queuedBuffers_) {
FrameBuffer *buffer = it.second;
@@ -1845,7 +1847,7 @@ int V4L2VideoDevice::streamOff()
queuedBuffers_.clear();
fdBufferNotifier_->setEnabled(false);
streaming_ = false;
state_ = State::Stopped;
return 0;
}