[{"id":11035,"web_url":"https://patchwork.libcamera.org/comment/11035/","msgid":"<20200701104219.GP5963@pendragon.ideasonboard.com>","date":"2020-07-01T10:42:19","subject":"Re: [libcamera-devel] [PATCH v2 3/6] libcamera: formats:\n\tPixelFormatInfo: Add v4l2 lookup function","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Tue, Jun 30, 2020 at 11:58:05PM +0900, Paul Elder wrote:\n> Add a lookup function for PixelFormatInfo that takes a V4L2PixelFormat.\n> \n> Signed-off-by: Paul Elder \n> \n> ---\n> Changes in v2:\n> - move invalid PixelFormatInfo instance to anonymous namespace\n> - add documentation\n> ---\n> include/libcamera/internal/formats.h | 1 +\n> src/libcamera/formats.cpp | 23 +++++++++++++++++++++--\n> 2 files changed, 22 insertions(+), 2 deletions(-)\n> \n> diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\n> index dc19492..3c7440a 100644\n> --- a/include/libcamera/internal/formats.h\n> +++ b/include/libcamera/internal/formats.h\n> @@ -44,6 +44,7 @@ public:\n> \tbool isValid() const { return format.isValid(); }\n> \n> \tstatic const PixelFormatInfo &info(const PixelFormat &format);\n> +\tstatic const PixelFormatInfo &info(const V4L2PixelFormat &format);\n> \n> \tconst char *name;\n> \tPixelFormat format;\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 8076c39..4d18825 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -7,6 +7,7 @@\n> \n> #include \"libcamera/internal/formats.h\"\n> \n> +#include \n> #include \n> \n> #include \n> @@ -190,6 +191,8 @@ const std::map> &ImageFormats::data() const\n> \n> namespace {\n> \n> +const PixelFormatInfo invalid{};\n\nThis is a possibly candidate for a later namespace clash. I would either\ncall it pixelFormatInfoInvalid, or add it as an entry in the\npixelFormatInfo map.\n\n> +\n> const std::map pixelFormatInfo{\n> \t/* RGB formats. */\n> \t{ formats::BGR888, {\n> @@ -661,8 +664,6 @@ const std::map pixelFormatInfo{\n> */\n> const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format)\n> {\n> -\tstatic const PixelFormatInfo invalid{};\n> -\n> \tconst auto iter = pixelFormatInfo.find(format);\n> \tif (iter == pixelFormatInfo.end()) {\n> \t\tLOG(Formats, Warning)\n> @@ -674,4 +675,22 @@ const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format)\n> \treturn iter->second;\n> }\n> \n> +/**\n> + * \\brief Retrieve information about a pixel format\n> + * \\param[in] format The V4L2 pixel format\n> + * \\return The PixelFormatInfo describing the V4L2 \\a format if known, or an\n> + * invalid PixelFormatInfo otherwise\n> + */\n> +const PixelFormatInfo &PixelFormatInfo::info(const V4L2PixelFormat &format)\n> +{\n> +\tauto info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\n\n\tconst auto &info = ...\n\nto ensure that it will be a const reference and not a copy.\n\nWith these two changes,\n\nReviewed-by: Laurent Pinchart \n\n> +\t\t\t\t [format](auto pair) {\n> +\t\t\t\t\t return pair.second.v4l2Format == format;\n> +\t\t\t\t });\n> +\tif (info == pixelFormatInfo.end())\n> +\t\treturn invalid;\n> +\n> +\treturn info->second;\n> +}\n> +\n> } /* namespace libcamera */","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 99E85BF415\n\tfor ;\n\tWed, 1 Jul 2020 10:42:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1976760C56;\n\tWed, 1 Jul 2020 12:42:25 +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 4115E603B4\n\tfor ;\n\tWed, 1 Jul 2020 12:42:23 +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 ABAF7556;\n\tWed, 1 Jul 2020 12:42:22 +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=\"IoUNRHmA\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593600142;\n\tbh=Qnv2xoK3vZIXy2urqyh6+391um/kBvHiwkvgfygCJ3I=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=IoUNRHmAYTWdOfPo4gIoMB3tmrWBG5BC3ASoeA/Tgy2Xj825h3Npn+/cVAF9TFGDe\n\ttfXI2ANtB3sQxx6iSVPmnLjDq58yxzluZbrqtrh6O1GVxyKcbH6hIv/CFXD6zOt3sa\n\tJ02NVwc3D5cIOT0eYISCdn2sIvE4aqCsOJxQZE8s=","Date":"Wed, 1 Jul 2020 13:42:19 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"<20200701104219.GP5963@pendragon.ideasonboard.com>","References":"<20200630145808.2976956-1-paul.elder@ideasonboard.com>\n\t<20200630145808.2976956-4-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200630145808.2976956-4-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v2 3/6] libcamera: formats:\n\tPixelFormatInfo: Add v4l2 lookup function","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\" "}}]