summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libcamera/ipa/ipu3.mojom2
-rw-r--r--src/ipa/ipu3/ipu3.cpp2
-rw-r--r--src/libcamera/pipeline/ipu3/ipu3.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom
index 2f254ed4..16e3462e 100644
--- a/include/libcamera/ipa/ipu3.mojom
+++ b/include/libcamera/ipa/ipu3.mojom
@@ -23,11 +23,13 @@ struct IPU3Event {
int64 frameTimestamp;
uint32 bufferId;
libcamera.ControlList controls;
+ libcamera.ControlList sensorControls;
};
struct IPU3Action {
IPU3Operations op;
libcamera.ControlList controls;
+ libcamera.ControlList sensorControls;
};
struct IPAConfigInfo {
diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
index 93b700bd..bcc3863b 100644
--- a/src/ipa/ipu3/ipu3.cpp
+++ b/src/ipa/ipu3/ipu3.cpp
@@ -653,7 +653,7 @@ void IPAIPU3::setControls(unsigned int frame)
ControlList ctrls(ctrls_);
ctrls.set(V4L2_CID_EXPOSURE, static_cast<int32_t>(exposure_));
ctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain_));
- op.controls = ctrls;
+ op.sensorControls = ctrls;
queueFrameAction.emit(frame, op);
}
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 3cd7383f..75fb2d90 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -1248,7 +1248,7 @@ void IPU3CameraData::queueFrameAction(unsigned int id,
{
switch (action.op) {
case ipa::ipu3::ActionSetSensorControls: {
- const ControlList &controls = action.controls;
+ const ControlList &controls = action.sensorControls;
delayedCtrls_->push(controls);
break;
}