[libcamera-devel] [PATCH 03/10] ipa: raspberrypi: Control the lens position

[Jean-Michel Hautbois]

Now that the ancillary links are configured, we can use the CameraLens
class and control the VCM through the IPA.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois at ideasonboard.com>
---
 src/ipa/raspberrypi/raspberrypi.cpp | 30 ++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 3b126bb5..1e9e2e61 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -30,6 +30,7 @@
 
 #include "libcamera/internal/mapped_framebuffer.h"
 
+#include "af_status.h"
 #include "agc_algorithm.hpp"
 #include "agc_status.h"
 #include "alsc_status.h"
@@ -110,6 +111,7 @@ private:
 	void setMode(const IPACameraSensorInfo &sensorInfo);
 	bool validateSensorControls();
 	bool validateIspControls();
+	bool validateLensControls();
 	void queueRequest(const ControlList &controls);
 	void returnEmbeddedBuffer(unsigned int bufferId);
 	void prepareISP(const ISPConfig &data);
@@ -134,6 +136,7 @@ private:
 
 	ControlInfoMap sensorCtrls_;
 	ControlInfoMap ispCtrls_;
+	ControlInfoMap lensCtrls_;
 	ControlList libcameraMetadata_;
 
 	/* Camera sensor params. */
@@ -346,7 +349,7 @@ int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,
 		      const IPAConfig &ipaConfig,
 		      ControlList *controls, IPAConfigResult *result)
 {
-	if (entityControls.size() != 2) {
+	if (entityControls.size() < 2) {
 		LOG(IPARPI, Error) << "No ISP or sensor controls found.";
 		return -1;
 	}
@@ -354,6 +357,14 @@ int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,
 	sensorCtrls_ = entityControls.at(0);
 	ispCtrls_ = entityControls.at(1);
 
+	/* Lens may not be present, don't make it an hard assumption. */
+	auto lensControl = entityControls.find(2);
+	if (lensControl != entityControls.end()) {
+		lensCtrls_ = lensControl->second;
+		if (!validateLensControls())
+			LOG(IPARPI, Error) << "Lens control validation failed.";
+	}
+
 	if (!validateSensorControls()) {
 		LOG(IPARPI, Error) << "Sensor control validation failed.";
 		return -1;
@@ -585,6 +596,23 @@ bool IPARPi::validateIspControls()
 	return true;
 }
 
+bool IPARPi::validateLensControls()
+{
+	static const uint32_t ctrls[] = {
+		V4L2_CID_FOCUS_ABSOLUTE,
+	};
+
+	for (auto c : ctrls) {
+		if (lensCtrls_.find(c) == lensCtrls_.end()) {
+			LOG(IPARPI, Error) << "Unable to find lens control "
+					   << utils::hex(c);
+			return false;
+		}
+	}
+
+	return true;
+}
+
 /*
  * Converting between enums (used in the libcamera API) and the names that
  * we use to identify different modes. Unfortunately, the conversion tables
-- 
2.34.1