From patchwork Mon Jun 29 11:53:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 8497 X-Patchwork-Delegate: jacopo@jmondi.org 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 8CCC7BF415 for ; Mon, 29 Jun 2020 11:50:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 90B03609D6; Mon, 29 Jun 2020 13:50:14 +0200 (CEST) Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 15B45609C9 for ; Mon, 29 Jun 2020 13:50:13 +0200 (CEST) Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 6DD32100012; Mon, 29 Jun 2020 11:50:12 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Mon, 29 Jun 2020 13:53:27 +0200 Message-Id: <20200629115328.16273-3-jacopo@jmondi.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200629115328.16273-1-jacopo@jmondi.org> References: <20200629105037.14706-1-jacopo@jmondi.org> <20200629115328.16273-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/4] libcamera: formats: Add ImageFormats::contains() 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" Add a method to check if a format is part of the formats map. Reviewed-by: Laurent Pinchart Signed-off-by: Jacopo Mondi --- include/libcamera/internal/formats.h | 1 + src/libcamera/formats.cpp | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) -- 2.27.0 diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h index aba83511179f..c3bda8214991 100644 --- a/include/libcamera/internal/formats.h +++ b/include/libcamera/internal/formats.h @@ -25,6 +25,7 @@ public: int addFormat(T format, const std::vector &sizes); bool isEmpty() const; + bool contains(T format) const; std::vector formats() const; const std::vector &sizes(T format) const; const std::map> &data() const; diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index a5607da3efd4..61bf7b5cb16d 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -48,7 +48,7 @@ LOG_DEFINE_CATEGORY(Formats) template int ImageFormats::addFormat(T format, const std::vector &sizes) { - if (data_.find(format) != data_.end()) + if (contains(format)) return -EEXIST; data_[format] = sizes; @@ -66,6 +66,17 @@ bool ImageFormats::isEmpty() const return data_.empty(); } +/** + * \brief Check if the formats map contains \a format + * \param[in] format The format + * \return True if the map contains such format, false otherwise + */ +template +bool ImageFormats::contains(T format) const +{ + return data_.find(format) != data_.end(); +} + /** * \brief Retrieve a list of all supported image formats * \return List of pixel formats or media bus codes