[{"id":10873,"web_url":"https://patchwork.libcamera.org/comment/10873/","msgid":"<20200626013702.GU5865@pendragon.ideasonboard.com>","date":"2020-06-26T01:37:02","subject":"Re: [libcamera-devel] [PATCH v2 4/6] libcamera: formats: Add\n\tImageFormats::contain()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\ns/contain/contains/ in the subject line.\n\nOn Tue, Jun 09, 2020 at 01:28:42AM +0200, Jacopo Mondi wrote:\n> Add a method to check if a format is part of the formats enumeration.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> include/libcamera/internal/formats.h | 1 +\n> src/libcamera/formats.cpp | 11 +++++++++++\n> 2 files changed, 12 insertions(+)\n> \n> diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\n> index cb840014cbd7..914fdde27d0c 100644\n> --- a/include/libcamera/internal/formats.h\n> +++ b/include/libcamera/internal/formats.h\n> @@ -33,6 +33,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;\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index fe50b9aaa1f2..9f46f82c9059 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -99,6 +99,17 @@ bool ImageFormats::isEmpty() const\n> \treturn data_.empty();\n> }\n> \n> +/**\n> + * \\brief Check if the formats enumeration contains \\a format\n\ns/enumeration/map/ (and same below). The ImageFormats documentation\ndoesn't mention \"enumeration\" anywhere.\n\n> + * \\param[in] format The format\n> + * \\return True if the enumeration contains such format, false otherwise\n> + */\n> +template\n> +bool ImageFormats::contains(T format) const\n> +{\n> +\treturn data_.find(format) == data_.end();\n\nShouldn't this be\n\n\treturn data_.find(format) != data_.end();\n\n? Either the function is not used, or we're missing a test. If you want\nto keep this patch, please add a test for it :-)\n\nWith this fixed (the test can be in a different patch as it seems we\nhave no ImageFormats test yet),\n\nReviewed-by: Laurent Pinchart \n\n> +}\n> +\n> /**\n> * \\brief Retrieve a list of all supported image formats\n> * \\return List of pixel formats or media bus codes","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 CB636C0109\n\tfor ;\n\tFri, 26 Jun 2020 01:37:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4F577609C5;\n\tFri, 26 Jun 2020 03:37:07 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2E571603BA\n\tfor ;\n\tFri, 26 Jun 2020 03:37:06 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 22460595;\n\tFri, 26 Jun 2020 03:37:04 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"O+fDJ0HP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593135425;\n\tbh=0Rp616jIMHr1gbSaG/JIYXZV6BFjM9C7bipemMHCiuk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=O+fDJ0HP524aMCyV5I8Ejy9aP+TsroTCSMqt4iEItemSrWWwmt0vJ8p+W/b5LGGCD\n\tw7+s9xsLvfzJfsJPPdUNO3sRzLQUdM6dC0EEsnl9KH3lT8TJ+kDDaPdgOBErUm7IM0\n\tLob/2fH+YAtogQXlNn2x8eK3R/TqK8FTvgU2uTJI=","Date":"Fri, 26 Jun 2020 04:37:02 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Message-ID":"<20200626013702.GU5865@pendragon.ideasonboard.com>","References":"<20200608232844.10150-1-jacopo@jmondi.org>\n\t<20200608232844.10150-5-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200608232844.10150-5-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 4/6] libcamera: formats: Add\n\tImageFormats::contain()","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]