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

v4l2_videodevice: Disable the watchdog timer when no buffers are queued

Browse Source 
Only enable/reset the watchdog timer when there are buffers queued in the V4L2
device. Otherwise, we may trigger spurious warnings when the watchdog times out
even if there are no buffers queued in the device.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Tested-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Naushir Patuck
2022-05-05 09:48:24 +01:00
committed by Kieran Bingham
parent 065a9e6c05
commit c39b52c184
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libcamera/v4l2_videodevice.cpp
View File

@@ -1662,8 +1662,11 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer)
return ret;
}
if (queuedBuffers_.empty())
if (queuedBuffers_.empty()) {
fdBufferNotifier_->setEnabled(true);
if (watchdogDuration_)
watchdog_.start(std::chrono::duration_cast<std::chrono::milliseconds>(watchdogDuration_));
}
queuedBuffers_[buf.index] = buffer;
@@ -1742,16 +1745,21 @@ FrameBuffer *V4L2VideoDevice::dequeueBuffer()
return nullptr;
}
if (watchdogDuration_.count())
watchdog_.start(std::chrono::duration_cast<std::chrono::milliseconds>(watchdogDuration_));
cache_->put(buf.index);
FrameBuffer *buffer = it->second;
queuedBuffers_.erase(it);
if (queuedBuffers_.empty())
if (queuedBuffers_.empty()) {
fdBufferNotifier_->setEnabled(false);
watchdog_.stop();
} else if (watchdogDuration_) {
/*
* Restart the watchdog timer if there are buffers still queued
* in the device.
*/
watchdog_.start(std::chrono::duration_cast<std::chrono::milliseconds>(watchdogDuration_));
}
buffer->metadata_.status = buf.flags & V4L2_BUF_FLAG_ERROR
? FrameMetadata::FrameError
@@ -1847,7 +1855,7 @@ int V4L2VideoDevice::streamOn()
}
state_ = State::Streaming;
if (watchdogDuration_.count())
if (watchdogDuration_ && !queuedBuffers_.empty())
watchdog_.start(std::chrono::duration_cast<std::chrono::milliseconds>(watchdogDuration_));
return 0;
@@ -1924,7 +1932,7 @@ void V4L2VideoDevice::setDequeueTimeout(utils::Duration timeout)
watchdogDuration_ = timeout;
watchdog_.stop();
if (watchdogDuration_.count() && state_ == State::Streaming)
if (watchdogDuration_ && state_ == State::Streaming && !queuedBuffers_.empty())
watchdog_.start(std::chrono::duration_cast<std::chrono::milliseconds>(timeout));
}