{"id":8497,"url":"https://patchwork.libcamera.org/api/1.1/patches/8497/?format=json","web_url":"https://patchwork.libcamera.org/patch/8497/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200629115328.16273-3-jacopo@jmondi.org>","date":"2020-06-29T11:53:27","name":"[libcamera-devel,v3,3/4] libcamera: formats: Add ImageFormats::contains()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1fb883be4585d67aeb618732e4fb9003e3fd5a7a","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/8497/mbox/","series":[{"id":1055,"url":"https://patchwork.libcamera.org/api/1.1/series/1055/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1055","date":"2020-06-29T10:50:33","name":"ImageFormat rework","version":3,"mbox":"https://patchwork.libcamera.org/series/1055/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8497/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8497/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8CCC7BF415\n\tfor ;\n\tMon, 29 Jun 2020 11:50:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 90B03609D6;\n\tMon, 29 Jun 2020 13:50:14 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 15B45609C9\n\tfor ;\n\tMon, 29 Jun 2020 13:50:13 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 6DD32100012;\n\tMon, 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>\n\t<20200629115328.16273-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 3/4] libcamera: formats: Add\n\tImageFormats::contains()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a method to check if a format is part of the formats map.\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/formats.h | 1 +\n src/libcamera/formats.cpp | 13 ++++++++++++-\n 2 files changed, 13 insertions(+), 1 deletion(-)\n\n--\n2.27.0","diff":"diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\nindex aba83511179f..c3bda8214991 100644\n--- a/include/libcamera/internal/formats.h\n+++ b/include/libcamera/internal/formats.h\n@@ -25,6 +25,7 @@ public:\n \tint addFormat(T format, const std::vector &sizes);\n\n \tbool isEmpty() const;\n+\tbool contains(T format) const;\n \tstd::vector formats() const;\n \tconst std::vector &sizes(T format) const;\n \tconst std::map> &data() const;\ndiff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex a5607da3efd4..61bf7b5cb16d 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -48,7 +48,7 @@ LOG_DEFINE_CATEGORY(Formats)\n template\n int ImageFormats::addFormat(T format, const std::vector &sizes)\n {\n-\tif (data_.find(format) != data_.end())\n+\tif (contains(format))\n \t\treturn -EEXIST;\n\n \tdata_[format] = sizes;\n@@ -66,6 +66,17 @@ bool ImageFormats::isEmpty() const\n \treturn data_.empty();\n }\n\n+/**\n+ * \\brief Check if the formats map contains \\a format\n+ * \\param[in] format The format\n+ * \\return True if the map contains such format, false otherwise\n+ */\n+template\n+bool ImageFormats::contains(T format) const\n+{\n+\treturn data_.find(format) != data_.end();\n+}\n+\n /**\n * \\brief Retrieve a list of all supported image formats\n * \\return List of pixel formats or media bus codes\n","prefixes":["libcamera-devel","v3","3/4"]}