From patchwork Sat Mar 21 00:36:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3232 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 33E4C62BBA for ; Sat, 21 Mar 2020 01:36:52 +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 B4655A54; 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=WkVhICCZLGxluzQQoI6YYP/MJbEJ6X5+ql3oFelp9qs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rfG70g7ltmePkCRu6LAoesrioP2+z/N4THAU0o1rUJkmrn6/iaiBGMNu9MuDx0dQ8 4TJ8SlmsSvDQ7Ef16SQ/9Io+YcOGTl8P/ZCYBiRwQbgma8MM5imm+2uMPul9fEjRvp GMqUQzeBW4DHvbJHVoniUnCpXE1DytiPN5qm2i/A= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 21 Mar 2020 02:36:37 +0200 Message-Id: <20200321003640.2156-5-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 4/7] libcamera: v4l2_device: Support reading U8 array 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 retrieve the value of array controls of type V4L2_CTRL_TYPE_U8. Signed-off-by: Jacopo Mondi Signed-off-by: Laurent Pinchart --- Changes since v1: - Use writable ControlValue storage directly for arrays in getControls() - Handle the control type more generically - Improve error message for unsupported types - Rename ctrlsInfo_ to controlInfo_ --- src/libcamera/v4l2_device.cpp | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 2139e98bc9b8..3c91eb3f9f97 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -176,7 +176,7 @@ int V4L2Device::getControls(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()) { @@ -185,6 +185,31 @@ int V4L2Device::getControls(ControlList *ctrls) return -EINVAL; } + const struct v4l2_query_ext_ctrl &info = controlInfo_[id]; + ControlValue &value = ctrl.second; + + if (info.flags & V4L2_CTRL_FLAG_HAS_PAYLOAD) { + ControlType type; + + switch (info.type) { + case V4L2_CTRL_TYPE_U8: + type = ControlTypeByte; + break; + + default: + LOG(V4L2, Error) + << "Unsupported payload control type " + << info.type; + return -EINVAL; + } + + value.reserve(type, true, info.elems); + Span data = value.data(); + + v4l2Ctrls[i].p_u8 = data.data(); + v4l2Ctrls[i].size = data.size(); + } + v4l2Ctrls[i].id = id; i++; }