summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Scally <djrscally@gmail.com>2022-03-03 23:49:53 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2022-03-15 17:20:59 +0000
commit5413e78893183bd4c0225a04656c6770db49e274 (patch)
tree44589d3f3c4ce0c3e5a8b73eb42e6747a1e85cd5
parent931556c37c251ea00404915669cc45a04a25cd2d (diff)
libcamera: ipa: Add lens control member to ipu3 ipa interface
Add further members to the ipu3 ipa interface that will hold lens controls passed in by configInfo Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Daniel Scally <djrscally@gmail.com> Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--include/libcamera/ipa/ipu3.mojom1
-rw-r--r--src/ipa/ipu3/ipu3.cpp3
2 files changed, 4 insertions, 0 deletions
diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom
index cc0d822f..18cdc744 100644
--- a/include/libcamera/ipa/ipu3.mojom
+++ b/include/libcamera/ipa/ipu3.mojom
@@ -37,6 +37,7 @@ struct IPU3Action {
struct IPAConfigInfo {
libcamera.IPACameraSensorInfo sensorInfo;
libcamera.ControlInfoMap sensorControls;
+ libcamera.ControlInfoMap lensControls;
libcamera.Size bdsOutputSize;
libcamera.Size iif;
};
diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
index 1c4ff2d7..de51da3e 100644
--- a/src/ipa/ipu3/ipu3.cpp
+++ b/src/ipa/ipu3/ipu3.cpp
@@ -162,6 +162,7 @@ private:
std::map<unsigned int, MappedFrameBuffer> buffers_;
ControlInfoMap ctrls_;
+ ControlInfoMap lensCtrls_;
IPACameraSensorInfo sensorInfo_;
@@ -425,6 +426,8 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,
sensorInfo_ = configInfo.sensorInfo;
+ lensCtrls_ = configInfo.lensControls;
+
/*
* Compute the sensor V4L2 controls to be used by the algorithms and
* to be set on the sensor.