[libcamera-devel,4/5] libcamera: camera_sensor: Add controls() method
diff mbox series

Message ID 20201223184516.58791-5-jacopo@jmondi.org
State Superseded
Delegated to: Jacopo Mondi
Headers show
Series
  • libcamera: Register CameraSensor controls
Related show

Commit Message

Jacopo Mondi Dec. 23, 2020, 6:45 p.m. UTC
Add a controls() method to retrieve the map of libcamera controls
registered by the CameraSensor class.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 include/libcamera/internal/camera_sensor.h | 1 +
 src/libcamera/camera_sensor.cpp            | 6 ++++++
 2 files changed, 7 insertions(+)

Comments

Paul Elder Dec. 28, 2020, 8:28 a.m. UTC | #1
Hi Jacopo,

On Wed, Dec 23, 2020 at 07:45:15PM +0100, Jacopo Mondi wrote:
> Add a controls() method to retrieve the map of libcamera controls
> registered by the CameraSensor class.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>

> ---
>  include/libcamera/internal/camera_sensor.h | 1 +
>  src/libcamera/camera_sensor.cpp            | 6 ++++++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h
> index 841c7f4bef0f..10877b9d1d9d 100644
> --- a/include/libcamera/internal/camera_sensor.h
> +++ b/include/libcamera/internal/camera_sensor.h
> @@ -62,6 +62,7 @@ public:
>  	int setControls(ControlList *ctrls);
>  
>  	const ControlList &properties() const { return properties_; }
> +	const ControlInfoMap &controls() const { return controls_; }
>  	int sensorInfo(CameraSensorInfo *info) const;
>  
>  protected:
> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
> index fa85484f6186..e95a254c03cc 100644
> --- a/src/libcamera/camera_sensor.cpp
> +++ b/src/libcamera/camera_sensor.cpp
> @@ -652,6 +652,12 @@ ControlList CameraSensor::getControls(const std::vector<uint32_t> &ids)
>   * \return The list of camera sensor properties
>   */
>  
> +/**
> + * \fn CameraSensor::controls()
> + * \brief Retrieve the camera sensor controls info
> + * \return The map of camera sensor controls info
> + */
> +
>  /**
>   * \brief Write controls to the sensor
>   * \param[in] ctrls The list of controls to write
> -- 
> 2.29.2
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch
diff mbox series

diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h
index 841c7f4bef0f..10877b9d1d9d 100644
--- a/include/libcamera/internal/camera_sensor.h
+++ b/include/libcamera/internal/camera_sensor.h
@@ -62,6 +62,7 @@  public:
 	int setControls(ControlList *ctrls);
 
 	const ControlList &properties() const { return properties_; }
+	const ControlInfoMap &controls() const { return controls_; }
 	int sensorInfo(CameraSensorInfo *info) const;
 
 protected:
diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
index fa85484f6186..e95a254c03cc 100644
--- a/src/libcamera/camera_sensor.cpp
+++ b/src/libcamera/camera_sensor.cpp
@@ -652,6 +652,12 @@  ControlList CameraSensor::getControls(const std::vector<uint32_t> &ids)
  * \return The list of camera sensor properties
  */
 
+/**
+ * \fn CameraSensor::controls()
+ * \brief Retrieve the camera sensor controls info
+ * \return The map of camera sensor controls info
+ */
+
 /**
  * \brief Write controls to the sensor
  * \param[in] ctrls The list of controls to write