From patchwork Mon Jun 24 14:28:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 1507 Return-Path: Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 18A526162F for ; Mon, 24 Jun 2019 16:27:53 +0200 (CEST) X-Originating-IP: 2.224.242.101 Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 766352000D; Mon, 24 Jun 2019 14:27:52 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Mon, 24 Jun 2019 16:28:57 +0200 Message-Id: <20190624142859.19313-5-jacopo@jmondi.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190624142859.19313-1-jacopo@jmondi.org> References: <20190624142859.19313-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 4/6] libcamera: camera_sensor: Add V4L2 control operations X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Jun 2019 14:27:53 -0000 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 Reviewed-by: Laurent Pinchart --- src/libcamera/camera_sensor.cpp | 69 +++++++++++++++++++++++++++ src/libcamera/include/camera_sensor.h | 6 +++ 2 files changed, 75 insertions(+) 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;