From patchwork Sat Mar 21 00:36:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3230 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 6936D62BA9 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 EA960A54; Sat, 21 Mar 2020 01:36:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584751011; bh=+gpWLOTwj2hkj3rLy7bRt3VSRI+ILclZJ2h8Dx9BPF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HvtG1c2ypB3h+WMTs/vXx/aIIgIpfmvIYu06hsPDybiqUobxdDJW/ihJGV9Pp2lS6 O0r2wYljM8P1p9hnsoy5PCbcWyYg1O6FOoF9VZSFOWaJRwL+lS9YJlXqvaGxBPhqe6 y+h3rtoN3703MxKn9AU6YtnHtpGO1OgF6aJbV+gI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 21 Mar 2020 02:36:35 +0200 Message-Id: <20200321003640.2156-3-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 2/7] libcamera: v4l2_controls: Cache query control information 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 Cache the V4L2 control info retrieved with VIDIOC_QUERY_EXT_CTRL at control listing time for later use. Signed-off-by: Jacopo Mondi Signed-off-by: Laurent Pinchart --- Changes since v1: - Rename ctrlsInfo_ to controlInfo_ - Add entry in controlInfo_ with emplace --- src/libcamera/include/v4l2_device.h | 1 + src/libcamera/v4l2_device.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h index 6bfddefe336c..ce8edd98a01d 100644 --- a/src/libcamera/include/v4l2_device.h +++ b/src/libcamera/include/v4l2_device.h @@ -48,6 +48,7 @@ private: const struct v4l2_ext_control *v4l2Ctrls, unsigned int count); + std::map controlInfo_; std::vector> controlIds_; ControlInfoMap controls_; std::string deviceNode_; diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 179476e9afad..7eded67cb47e 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -381,6 +381,8 @@ void V4L2Device::listControls() } controlIds_.emplace_back(std::make_unique(ctrl)); + controlInfo_.emplace(ctrl.id, ctrl); + ctrls.emplace(controlIds_.back().get(), V4L2ControlInfo(ctrl)); }