From patchwork Tue Aug 10 16:11:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 13292 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 989C0C3241 for ; Tue, 10 Aug 2021 16:11:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9A07B68889; Tue, 10 Aug 2021 18:11:40 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Q19egqXp"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 865536882A for ; Tue, 10 Aug 2021 18:11:37 +0200 (CEST) Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 35E2D51D; Tue, 10 Aug 2021 18:11:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1628611897; bh=GYAGZA65zSTTH4oYxRWQzmpCkpgf3bwVqLP0gekS1iY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q19egqXpDMOJ0XPZuvBDqgePEkMx7dfK7Kv0TwlOmIcGA4QsvXl53fnXU81+38Lhu UOcgi0FQ4fJALcDVMruFP/8NLfxuMTIo/iOs/2cIQ8BMuHOojkJPxQ53Wr0aJUylHb KsxhIirqikAyPnCfBwR8aa4eR9ufKI6jfFqjX8UY= From: Kieran Bingham To: libcamera devel Date: Tue, 10 Aug 2021 17:11:33 +0100 Message-Id: <20210810161134.2243796-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210810161134.2243796-1-kieran.bingham@ideasonboard.com> References: <20210810161134.2243796-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] libcamera: camera: Create a CameraControlValidator 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" Create a Camera specific CameraControlValidator for the Camera instance. This will allow requests to use a single validor instance without having to construct their own. Signed-off-by: Kieran Bingham --- Laurent: - Is the use of the _o() reference valid here in the initialiser list? include/libcamera/internal/camera.h | 6 ++++++ src/libcamera/camera.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h index b60ed140356a..f14bafc75e05 100644 --- a/include/libcamera/internal/camera.h +++ b/include/libcamera/internal/camera.h @@ -16,6 +16,8 @@ #include +#include "libcamera/internal/camera_controls.h" + namespace libcamera { class PipelineHandler; @@ -30,6 +32,8 @@ public: const std::set &streams); ~Private(); + const CameraControlValidator &validator() const { return validator_; } + private: enum State { CameraAvailable, @@ -56,6 +60,8 @@ private: bool disconnected_; std::atomic state_; + + CameraControlValidator validator_; }; } /* namespace libcamera */ diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 6281e92057e4..b914bf188d57 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -336,7 +336,7 @@ Camera::Private::Private(PipelineHandler *pipe, const std::string &id, const std::set &streams) : pipe_(pipe->shared_from_this()), id_(id), streams_(streams), - disconnected_(false), state_(CameraAvailable) + disconnected_(false), state_(CameraAvailable), validator_(_o()) { }