From patchwork Mon Sep 7 07:15:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 9503 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 482AEBDB1C for ; Mon, 7 Sep 2020 07:16:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0A2E262B8A; Mon, 7 Sep 2020 09:16:12 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="P90MQyHk"; dkim-atps=neutral Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2C40262B58 for ; Mon, 7 Sep 2020 09:16:10 +0200 (CEST) Received: by mail-wm1-x341.google.com with SMTP id w2so13305583wmi.1 for ; Mon, 07 Sep 2020 00:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JhpNMFUIDtZB0hDN1oH6vxGz9TYm4xD/PMsCnHNrOV8=; b=P90MQyHkVWqv97oGx4vd51ieezOP6kiK3FNtJudQ/6GpxxqimFsS4SbntPVThWcyFm WHJZZqbgPpeqTtrbgcZJgDf/tS6W1ovK3WqnV3Qw0UxHLvXpBMtP+pp23cIAgHc9smPU pJRpCxyWy/u2fqbTK06KYs7y4wWJmUfg4Ry2pYFF40BJ/IghAQ5kmApDMuID9xqQBWou omLSatve5QBWxmd2VoY/XXxlSgABVX4x47Lwru5rwfP4y5iFQ/2vBM4Q0su0kxXjPGyE KYYAsj76dRwKKpHHqlbk34Uu3jQyCQ0bKbpoKIhCnzqP9tKH/7Ug/O70oAPDJPgV8XDB GhnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JhpNMFUIDtZB0hDN1oH6vxGz9TYm4xD/PMsCnHNrOV8=; b=qvvNqDvTrlW3LTppnQ6rSvCCd/rVKH8MyWd71Bxs1nb4UyLL3Kq9n65aTLAwEBNEI3 DSH19j+Agtv2rb/GE0ED9a+0mpvssBH3hilnINvJ0tpLUNoVdnD86ZzfZpU4n3ZtpMtq lLSHZmZ8aYqb6GwLs2I7Oa1zJN2XwT/vbBxsv2PGBCFXIa4QlqL+Ulj5sdkYyOd8CIUE lMiPo1nZrCJVSNcz9fbRpDbWDIDiUobYTVyQw0g4AmylxCuH5An/mlxEywOwF0FAvHxF AZsiCNprQOsmB49ZkfNYHEaqajL7JLMJvmzdn+D5fAbZw8YARIiK/vS+CmdIjdI8d8q2 yIOw== X-Gm-Message-State: AOAM530avLhxhVSPh/6aAMc69Ot4gWJUMdajXklzb3qBOGkEegHWaLuz opZDIIyqfDDtOGGjYxBHffoYFEWGC64jSQ== X-Google-Smtp-Source: ABdhPJxbGV5oyeKySSo9NAVZJQIdUYPqkDyHrYqjW/KTzimiOwkHTVjwQ8Y0UM/71axXa26OY/5+sg== X-Received: by 2002:a7b:cb4e:: with SMTP id v14mr20122721wmj.140.1599462969526; Mon, 07 Sep 2020 00:16:09 -0700 (PDT) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id b2sm25543636wmh.47.2020.09.07.00.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 00:16:09 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Mon, 7 Sep 2020 08:15:57 +0100 Message-Id: <20200907071604.8355-3-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200907071604.8355-1-david.plowman@raspberrypi.com> References: <20200907071604.8355-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v8 2/8] libcamera: Allow access to v4l2_query_ext_ctrl structure for a V4L2 control 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The V4L2Device::controlInfo method simply returns a pointer to the v4l2_query_ext_ctrl structure for the given control, which has already been retrieved and stored. Signed-off-by: David Plowman Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/libcamera/internal/v4l2_device.h | 2 ++ src/libcamera/v4l2_device.cpp | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h index 3b605aa..722fb72 100644 --- a/include/libcamera/internal/v4l2_device.h +++ b/include/libcamera/internal/v4l2_device.h @@ -29,6 +29,8 @@ public: ControlList getControls(const std::vector &ids); int setControls(ControlList *ctrls); + const struct v4l2_query_ext_ctrl *controlInfo(uint32_t id) const; + const std::string &deviceNode() const { return deviceNode_; } std::string devicePath() const; diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 65830d4..31d4dad 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -353,6 +353,21 @@ int V4L2Device::setControls(ControlList *ctrls) return ret; } +/** + * \brief Retrieve the v4l2_query_ext_ctrl information for the given control + * \param[in] id The V4L2 control id + * \return A pointer to the v4l2_query_ext_ctrl structure for the given + * control, or a null pointer if not found + */ +const struct v4l2_query_ext_ctrl *V4L2Device::controlInfo(uint32_t id) const +{ + const auto it = controlInfo_.find(id); + if (it == controlInfo_.end()) + return nullptr; + + return &it->second; +} + /** * \brief Retrieve the device path in sysfs *