From patchwork Sat Mar 21 00:36:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3231 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C4DBC629AC for ; Sat, 21 Mar 2020 01:36:51 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 54E981265; Sat, 21 Mar 2020 01:36:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584751011; bh=jZBPg1dufv7uT5Rc6od88PpVb6kEWFLbu0m+gYgRZOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cKkDbQlwyta9509axDiB3zq4NirmZgb7NEY/ytcgCqGvN1XBkLJfQiUgPuxFiQP7D QtCaX3G3sNoi8wuHmRwofqn04QwQ24m3vJ5z1C9Dd9VKvqy2biouetIehXX8MVyclC Hr4PBT6x5rywGMWs5jvzFZ992WzzD7vf8jpk/OHo= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 21 Mar 2020 02:36:36 +0200 Message-Id: <20200321003640.2156-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321003640.2156-1-laurent.pinchart@ideasonboard.com> References: <20200321003640.2156-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 3/7] libcamera: v4l2_device: Support writing array U8 controls X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Mar 2020 00:36:52 -0000 From: Jacopo Mondi Add support to write array controls of type V4L2_CTRL_TYPE_U8. Signed-off-by: Jacopo Mondi Signed-off-by: Laurent Pinchart --- Changes since v1: - Avoid copy of data in updateControls() - Use writable ControlValue storage directly for arrays in setControls() - Return an error when setting a control with a non-array value --- src/libcamera/v4l2_device.cpp | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 7eded67cb47e..2139e98bc9b8 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -250,7 +250,7 @@ int V4L2Device::setControls(ControlList *ctrls) memset(v4l2Ctrls, 0, sizeof(v4l2Ctrls)); unsigned int i = 0; - for (const auto &ctrl : *ctrls) { + for (auto &ctrl : *ctrls) { unsigned int id = ctrl.first; const auto iter = controls_.find(id); if (iter == controls_.end()) { @@ -262,16 +262,29 @@ int V4L2Device::setControls(ControlList *ctrls) v4l2Ctrls[i].id = id; /* Set the v4l2_ext_control value for the write operation. */ - const ControlValue &value = ctrl.second; + ControlValue &value = ctrl.second; switch (iter->first->type()) { case ControlTypeInteger64: v4l2Ctrls[i].value64 = value.get(); break; + + case ControlTypeByte: { + if (!value.isArray()) { + LOG(V4L2, Error) + << "Control " << utils::hex(id) + << " requires an array value"; + return -EINVAL; + } + + Span data = value.data(); + v4l2Ctrls[i].p_u8 = data.data(); + v4l2Ctrls[i].size = data.size(); + + break; + } + default: - /* - * \todo To be changed when support for string and - * compound controls will be added. - */ + /* \todo To be changed to support strings. */ v4l2Ctrls[i].value = value.get(); break; } @@ -414,6 +427,14 @@ void V4L2Device::updateControls(ControlList *ctrls, case ControlTypeInteger64: value.set(v4l2Ctrl->value64); break; + + case ControlTypeByte: + /* + * No action required, the VIDIOC_[GS]_EXT_CTRLS ioctl + * accessed the ControlValue storage directly. + */ + break; + default: /* * \todo To be changed when support for string and