From patchwork Mon Mar 9 16:24:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 3073 Return-Path: Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C71C862923 for ; Mon, 9 Mar 2020 17:21:30 +0100 (CET) X-Originating-IP: 93.34.114.233 Received: from uno.lan (93-34-114-233.ip49.fastwebnet.it [93.34.114.233]) (Authenticated sender: jacopo@jmondi.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 90E4F6001C for ; Mon, 9 Mar 2020 16:21:30 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Mon, 9 Mar 2020 17:24:10 +0100 Message-Id: <20200309162414.720306-8-jacopo@jmondi.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200309162414.720306-1-jacopo@jmondi.org> References: <20200309162414.720306-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 07/11] 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: Mon, 09 Mar 2020 16:21:32 -0000 Add support to write array controls of type V4L2_CTRL_TYPE_U8. Signed-off-by: Jacopo Mondi --- src/libcamera/v4l2_device.cpp | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 65e97f92b01f..950e6286b84d 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -267,11 +267,25 @@ int V4L2Device::setControls(ControlList *ctrls) case ControlTypeInteger64: v4l2Ctrls[i].value64 = value.get(); break; + case ControlTypeByte: { + if (!value.isArray()) + /* + * \todo This happens if a V4L2_CTRL_TYPE_U8 + * control is set with a non-array ControlValue. + * + * Should we fail loudly here ? + */ + break; + + auto values = value.get>(); + v4l2Ctrls[i].p_u8 = const_cast(values.data()); + v4l2Ctrls[i].size = values.size_bytes(); + + 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; } @@ -413,6 +427,16 @@ void V4L2Device::updateControls(ControlList *ctrls, case ControlTypeInteger64: value.set(v4l2Ctrl->value64); break; + + case ControlTypeByte: { + std::vector data = { + v4l2Ctrl->p_u8, v4l2Ctrl->p_u8 + v4l2Ctrl->size + }; + Span values(data); + value.set>(values); + break; + } + default: /* * \todo To be changed when support for string and