From 5413e78893183bd4c0225a04656c6770db49e274 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Thu, 3 Mar 2022 23:49:53 +0000
Subject: 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>
---
 include/libcamera/ipa/ipu3.mojom | 1 +
 src/ipa/ipu3/ipu3.cpp            | 3 +++
 2 files changed, 4 insertions(+)

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.
-- 
cgit v1.2.1