[libcamera-devel,v8,4/5] libcamera: camera_lens: add CameraLens as a member of CameraSensor
diff mbox series

Message ID 20211203094426.101454-5-hanlinchen@chromium.org
State Accepted
Commit ad2bcbe5b55c8824288cd1752649f39f3a53af38
Headers show
Series
  • Introduce Lens class and apply auto focus on ipu3
Related show

Commit Message

Hanlin Chen Dec. 3, 2021, 9:44 a.m. UTC 
Add CameraLens as a member of CameraSensor. The patch does not implement how
to link the lens to the specific sensor yet. Only to provide an interface for
pipeline handler's usage.

Signed-off-by: Han-Lin Chen <hanlinchen@chromium.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/internal/camera_sensor.h | 5 +++++
 src/libcamera/camera_sensor.cpp            | 9 +++++++++
 2 files changed, 14 insertions(+)

Patch
diff mbox series 

diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h
index 2facbf3c..788c2fa3 100644
--- a/include/libcamera/internal/camera_sensor.h
+++ b/include/libcamera/internal/camera_sensor.h
@@ -24,6 +24,7 @@ 
 namespace libcamera {
 
 class BayerFormat;
+class CameraLens;
 class MediaEntity;
 
 class CameraSensor : protected Loggable
@@ -60,6 +61,8 @@  public:
 
 	void updateControlInfo();
 
+	CameraLens *focusLens() { return focusLens_.get(); }
+
 protected:
 	std::string logPrefix() const override;
 
@@ -91,6 +94,8 @@  private:
 	const BayerFormat *bayerFormat_;
 
 	ControlList properties_;
+
+	std::unique_ptr<CameraLens> focusLens_;
 };
 
 } /* namespace libcamera */
diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
index 6151b32e..c89d39e1 100644
--- a/src/libcamera/camera_sensor.cpp
+++ b/src/libcamera/camera_sensor.cpp
@@ -20,6 +20,7 @@ 
 #include <libcamera/base/utils.h>
 
 #include "libcamera/internal/bayer_format.h"
+#include "libcamera/internal/camera_lens.h"
 #include "libcamera/internal/camera_sensor_properties.h"
 #include "libcamera/internal/formats.h"
 #include "libcamera/internal/sysfs.h"
@@ -787,6 +788,14 @@  void CameraSensor::updateControlInfo()
 	subdev_->updateControlInfo();
 }
 
+/**
+ * \fn CameraSensor::focusLens_()
+ * \brief Retrieve the focus lens controller
+ *
+ * \return The focus lens controller. nullptr if no focus lens controller is
+ * connected to the sensor
+ */
+
 std::string CameraSensor::logPrefix() const
 {
 	return "'" + entity_->name() + "'";