NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: delayed_controls: Remove spurious no-op queued controls

Browse source 
In DelayedControls::applyControls(), the controls queue would be
extended via a no-op control push to fill the intermittent slots with
unchanged control values. This is needed so that we read back unchanged
control values correctly on every frame.

However, there was one additional no-op performed on every frame that is
not required, meaning that any controls queued by the pipeline handler
would have their write delayed by one further frame. The original
StaggeredCtrl did not do this, as it only had one index to manage,
whereas DelayedControls uses two.

Remove this last no-op push so that the pipeline_handler provided
controls would be written on the very next frame if possible. As a
consequence, we must mark the control update as completed within the
DelayedControls::applyControls() loop, otherwise it might get reused
when cycling through the ring buffer.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reported-by: David Plowman <david.plowman@raspberrypi.com>
Fixes: 3d4b7b0059 ("libcamera: delayed_controls: Add helper for controls that apply with a delay")
Tested-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Tested-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2021-03-04 08:17:25 +00:00 • committed by Kieran Bingham
parent f1569db3fb
commit 47e27ee93b
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libcamera/delayed_controls.cpp
View file

@ -226,11 +226,11 @@ void DelayedControls::applyControls(uint32_t sequence)
* values are set in time to satisfy the sensor delay.
*/
ControlList out(device_->controls());
for (const auto &ctrl : values_) {
for (auto &ctrl : values_) {
const ControlId *id = ctrl.first;
unsigned int delayDiff = maxDelay_ - controlParams_[id].delay;
unsigned int index = std::max<int>(0, writeCount_ - delayDiff);
const Info &info = ctrl.second[index];
Info &info = ctrl.second[index];
if (info.updated) {
if (controlParams_[id].priorityWrite) {
@ -253,12 +253,15 @@ void DelayedControls::applyControls(uint32_t sequence)
<< "Setting " << id->name()
<< " to " << info.toString()
<< " at index " << index;
/* Done with this update, so mark as completed. */
info.updated = false;
}
}
writeCount_++;
while (writeCount_ >= queueCount_) {
while (writeCount_ > queueCount_) {
LOG(DelayedControls, Debug)
<< "Queue is empty, auto queue no-op.";
push({});