diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2022-07-04 14:37:51 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2022-07-05 11:23:35 +0100 |
| commit | 6f539a6d2fa992c90782a7b7077cd009fce4457b (patch) | |
| tree | 8cf3e87b1efefb762a18bd9b835e9370c0f6389e | |
| parent | b3fd8e14b52b5a42aca3c7dadca064b95cf19758 (diff) | |
delayed_controls: Remove reduandant firstSequence_
The DelayedControls implementation tracked the sequence numbers to
determine the offset if a device did not commence with a sequence number
of 0.
This guarantee is now handled by the V4L2VideoDevice.
Remove the firstSequence_ offset and the corresponding running_ flag
which was used to track setting firstSequence_ from the DelayedControls.
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
| -rw-r--r-- | include/libcamera/internal/delayed_controls.h | 3 | ||||
| -rw-r--r-- | src/libcamera/delayed_controls.cpp | 12 |
2 files changed, 2 insertions, 13 deletions
diff --git a/include/libcamera/internal/delayed_controls.h b/include/libcamera/internal/delayed_controls.h index 703fdb66..f560c823 100644 --- a/include/libcamera/internal/delayed_controls.h +++ b/include/libcamera/internal/delayed_controls.h @@ -72,9 +72,6 @@ private: std::unordered_map<const ControlId *, ControlParams> controlParams_; unsigned int maxDelay_; - bool running_; - uint32_t firstSequence_; - uint32_t queueCount_; uint32_t writeCount_; /* \todo Evaluate if we should index on ControlId * or unsigned int */ diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp index 9667187e..527c3191 100644 --- a/src/libcamera/delayed_controls.cpp +++ b/src/libcamera/delayed_controls.cpp @@ -115,8 +115,6 @@ DelayedControls::DelayedControls(V4L2Device *device, */ void DelayedControls::reset() { - running_ = false; - firstSequence_ = 0; queueCount_ = 1; writeCount_ = 0; @@ -204,8 +202,7 @@ bool DelayedControls::push(const ControlList &controls) */ ControlList DelayedControls::get(uint32_t sequence) { - uint32_t adjustedSeq = sequence - firstSequence_; - unsigned int index = std::max<int>(0, adjustedSeq - maxDelay_); + unsigned int index = std::max<int>(0, sequence - maxDelay_); ControlList out(device_->controls()); for (const auto &ctrl : values_) { @@ -236,11 +233,6 @@ void DelayedControls::applyControls(uint32_t sequence) { LOG(DelayedControls, Debug) << "frame " << sequence << " started"; - if (!running_) { - firstSequence_ = sequence; - running_ = true; - } - /* * Create control list peeking ahead in the value queue to ensure * values are set in time to satisfy the sensor delay. @@ -279,7 +271,7 @@ void DelayedControls::applyControls(uint32_t sequence) } } - writeCount_ = sequence - firstSequence_ + 1; + writeCount_ = sequence + 1; while (writeCount_ > queueCount_) { LOG(DelayedControls, Debug) |