From patchwork Sat Oct 12 18:43:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2166 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9B1CD6196D for ; Sat, 12 Oct 2019 20:44:19 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BC3A133A for ; Sat, 12 Oct 2019 20:44:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1570905859; bh=vIQdsnSW8EKMO3MIx8ujNjFnihSBMuxBWiqf/RBv70M=; h=From:To:Subject:Date:In-Reply-To:References:From; b=GlnC1GMsaamdQol8aXOPq5+tk3GvpxVvENtZMdpxAAkBwkjBN9SDXMW8v6FZ/B5Qs kawLTYzyu8dFIcboAT2GeyZTlu4lH7m6lCtUvyFPZVUUm3Hr0JURbGMIxSPGD+LLq7 /grs97AVJbsEhl9um4lGpRZwOe2nkmE9/jepVZ6o= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 12 Oct 2019 21:43:58 +0300 Message-Id: <20191012184407.31684-6-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191012184407.31684-1-laurent.pinchart@ideasonboard.com> References: <20191012184407.31684-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 05/14] libcamera: controls: Default ControlList validator argument to nullptr 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, 12 Oct 2019 18:44:19 -0000 The ControlList constructor takes a validator pointer that can be null. Set its default value to nullptr to simplify code in users of ControlList. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- include/libcamera/controls.h | 2 +- src/ipa/rkisp1/rkisp1.cpp | 2 +- src/libcamera/request.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 342251c21018..12a13aacb198 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -126,7 +126,7 @@ private: using ControlListMap = std::unordered_map; public: - ControlList(ControlValidator *validator); + ControlList(ControlValidator *validator = nullptr); using iterator = ControlListMap::iterator; using const_iterator = ControlListMap::const_iterator; diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 02419e254f2d..80138f196184 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -220,7 +220,7 @@ void IPARkISP1::setControls(unsigned int frame) void IPARkISP1::metadataReady(unsigned int frame, unsigned int aeState) { - ControlList ctrls(nullptr); + ControlList ctrls; if (aeState) ctrls.set(controls::AeLocked, aeState == 2); diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 23d3ab6f422c..e800f1449888 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -69,7 +69,7 @@ Request::Request(Camera *camera, uint64_t cookie) /** * \todo: Add a validator for metadata controls. */ - metadata_ = new ControlList(nullptr); + metadata_ = new ControlList(); } Request::~Request()