[libcamera-devel,v6,4/6] libcamera: camera_sensor: Add V4L2 control operations

Message ID 20190624142859.19313-5-jacopo@jmondi.org
State Superseded
Headers show
Series
  • Add support for V4L2 controls
Related show

Commit Message

Jacopo Mondi June 24, 2019, 2:28 p.m. UTC
Add operations to get and set control and to retrieve the informations
on a V4L2 control. For simple camera sensors, the operations are
directly called on the underlying V4L2 subdevice.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/camera_sensor.cpp       | 69 +++++++++++++++++++++++++++
 src/libcamera/include/camera_sensor.h |  6 +++
 2 files changed, 75 insertions(+)

Patch

diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp
index a804a68c9d91..471c3e2e6e47 100644
--- a/src/libcamera/camera_sensor.cpp
+++ b/src/libcamera/camera_sensor.cpp
@@ -247,6 +247,75 @@  int CameraSensor::setFormat(V4L2SubdeviceFormat *format)
 	return subdev_->setFormat(0, format);
 }
 
+/**
+ * \brief Retrieve information about a control
+ * \param[in] id The control ID
+ * \return A pointer to the V4L2ControlInfo for control \a id, or nullptr
+ * if the sensor doesn't have such a control
+ */
+const V4L2ControlInfo *CameraSensor::getControlInfo(unsigned int id) const
+{
+	return subdev_->getControlInfo(id);
+}
+
+/**
+ * \brief Read controls from the sensor
+ * \param[inout] ctrls The list of controls to read
+ *
+ * This method reads the value of all controls contained in \a ctrls, and stores
+ * their values in the corresponding \a ctrls entry.
+ *
+ * If any control in \a ctrls is not supported by the device, is disabled (i.e.
+ * has the V4L2_CTRL_FLAG_DISABLED flag set), is a compound control, or if any
+ * other error occurs during validation of the requested controls, no control is
+ * read and this method returns -EINVAL.
+ *
+ * If an error occurs while reading the controls, the index of the first control
+ * that couldn't be read is returned. The value of all controls below that index
+ * are updated in \a ctrls, while the value of all the other controls are not
+ * changed.
+ *
+ * \sa V4L2Device::getControls()
+ *
+ * \return 0 on success or an error code otherwise
+ * \retval -EINVAL One of the control is not supported or not accessible
+ * \retval i The index of the control that failed
+ */
+int CameraSensor::getControls(V4L2ControlList *ctrls)
+{
+	return subdev_->getControls(ctrls);
+}
+
+/**
+ * \brief Write controls to the sensor
+ * \param[in] ctrls The list of controls to write
+ *
+ * This method writes the value of all controls contained in \a ctrls, and
+ * stores the values actually applied to the device in the corresponding
+ * \a ctrls entry.
+ *
+ * If any control in \a ctrls is not supported by the device, is disabled (i.e.
+ * has the V4L2_CTRL_FLAG_DISABLED flag set), is read-only, is a
+ * compound control, or if any other error occurs during validation of
+ * the requested controls, no control is written and this method returns
+ * -EINVAL.
+ *
+ * If an error occurs while writing the controls, the index of the first
+ * control that couldn't be written is returned. All controls below that index
+ * are written and their values are updated in \a ctrls, while all other
+ * controls are not written and their values are not changed.
+ *
+ * \sa V4L2Device::setControls()
+ *
+ * \return 0 on success or an error code otherwise
+ * \retval -EINVAL One of the control is not supported or not accessible
+ * \retval i The index of the control that failed
+ */
+int CameraSensor::setControls(V4L2ControlList *ctrls)
+{
+	return subdev_->setControls(ctrls);
+}
+
 std::string CameraSensor::logPrefix() const
 {
 	return "'" + subdev_->entity()->name() + "'";
diff --git a/src/libcamera/include/camera_sensor.h b/src/libcamera/include/camera_sensor.h
index b823480241a7..b42e7b8e1343 100644
--- a/src/libcamera/include/camera_sensor.h
+++ b/src/libcamera/include/camera_sensor.h
@@ -17,6 +17,8 @@ 
 namespace libcamera {
 
 class MediaEntity;
+class V4L2ControlInfo;
+class V4L2ControlList;
 class V4L2Subdevice;
 
 struct V4L2SubdeviceFormat;
@@ -41,6 +43,10 @@  public:
 				      const Size &size) const;
 	int setFormat(V4L2SubdeviceFormat *format);
 
+	const V4L2ControlInfo *getControlInfo(unsigned int id) const;
+	int getControls(V4L2ControlList *ctrls);
+	int setControls(V4L2ControlList *ctrls);
+
 protected:
 	std::string logPrefix() const;