1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
From 27aee329cde2a1a83ff6192eabefb1f6fcb32eb0 Mon Sep 17 00:00:00 2001
From: Stefan Klug <stefan.klug@ideasonboard.com>
Date: Wed, 25 Mar 2026 16:13:33 +0100
Subject: [PATCH] libcamera: delayed_controls: Add push() function that accepts
a sequence number
The push function is asymmetric to the get() and applyControls()
function in that it doesn't allow to specify a frame number. This leads
to the unfortunate situation that it is very difficult to detect if
anything goes out of sync. Add a version of the push() function that
takes a sequence parameter and warns when the sequence provided differs
from the expected sequence. Don't take any further actions for now to
see where issues pop up.
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
---
include/libcamera/internal/delayed_controls.h | 1 +
src/libcamera/delayed_controls.cpp | 32 ++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
--- a/include/libcamera/internal/delayed_controls.h
+++ b/include/libcamera/internal/delayed_controls.h
@@ -32,6 +32,7 @@ public:
void reset();
bool push(const ControlList &controls);
+ bool push(uint32_t sequence, const ControlList &controls);
ControlList get(uint32_t sequence);
void applyControls(uint32_t sequence);
--- a/src/libcamera/delayed_controls.cpp
+++ b/src/libcamera/delayed_controls.cpp
@@ -144,10 +144,40 @@ void DelayedControls::reset()
* Push a set of controls to the control queue. This increases the control queue
* depth by one.
*
+ * \note The usage of this function is discouraged as it does not provide a way
+ * to detect double pushes for the same sequence. Better use
+ * DelayedControls::push(uint32_t sequence, const ControlList &controls)
+ * instead.
+ *
* \returns true if \a controls are accepted, or false otherwise
*/
bool DelayedControls::push(const ControlList &controls)
{
+ LOG(DelayedControls, Debug) << "Deprecated: Push without sequence number";
+ return push(queueCount_, controls);
+}
+
+/**
+ * \brief Push a set of controls on the queue
+ * \param[in] sequence The sequence number to push for
+ * \param[in] controls List of controls to add to the device queue
+ *
+ * Push a set of controls to the control queue. This increases the control queue
+ * depth by one.
+ *
+ * The \a sequence number is used to do some sanity checks to detect double
+ * pushes for the same sequence (either due to a bug or a request underrun).
+ *
+ * \returns true if \a controls are accepted, or false otherwise
+ */
+bool DelayedControls::push(uint32_t sequence, const ControlList &controls)
+{
+ if (sequence < queueCount_) {
+ LOG(DelayedControls, Warning)
+ << "Double push for sequence " << sequence
+ << " current queue index: " << queueCount_;
+ }
+
/* Copy state from previous frame. */
for (auto &ctrl : values_) {
Info &info = ctrl.second[queueCount_];
@@ -276,7 +306,7 @@ void DelayedControls::applyControls(uint
while (writeCount_ > queueCount_) {
LOG(DelayedControls, Debug)
<< "Queue is empty, auto queue no-op.";
- push({});
+ push(queueCount_, {});
}
device_->setControls(&out);
|
