[{"id":10992,"web_url":"https://patchwork.libcamera.org/comment/10992/","msgid":"<20200629214603.GA21452@pendragon.ideasonboard.com>","date":"2020-06-29T21:46:03","subject":"Re: [libcamera-devel] [PATCH 3/6] libcamera: formats:\n\tPixelFormatInfo: Add v4l2 constructor","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 12:14:08AM +0900, Paul Elder wrote:\n> Add a constructor for PixelFormatInfo that takes a V4L2PixelFormat.\n\nIt's not a constructor, it's a lookup function.\n\n> \n> Signed-off-by: Paul Elder \n> ---\n> include/libcamera/internal/formats.h | 1 +\n> src/libcamera/formats.cpp | 16 ++++++++++++++--\n> 2 files changed, 15 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 88b5168..7029a94 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -631,6 +631,8 @@ const std::map pixelFormatInfo{\n> \n> } /* namespace */\n> \n> +static const PixelFormatInfo invalid{};\n\nYou can move this within the anonymous namespace and drop the static\nkeyword.\n\n> +\n> /**\n> * \\fn bool PixelFormatInfo::isValid() const\n> * \\brief Check if the pixel format info is valid\n> @@ -645,8 +647,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> @@ -658,4 +658,16 @@ const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format)\n> \treturn iter->second;\n> }\n> \n> +const PixelFormatInfo &PixelFormatInfo::info(const V4L2PixelFormat &format)\n\nDocumentation please.\n\n> +{\n> +\tauto info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\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 CD541BF415\n\tfor ;\n\tMon, 29 Jun 2020 21:46:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4BBFD609DB;\n\tMon, 29 Jun 2020 23:46:10 +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 E674F603B2\n\tfor ;\n\tMon, 29 Jun 2020 23:46:08 +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 F3221299;\n\tMon, 29 Jun 2020 23:46:07 +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=\"a60UnSSw\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593467168;\n\tbh=hBXW/kwxDQJTpbnAqCBz7zTDBH92DrypDJnRScoQGBg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=a60UnSSwGqUaHTI+IuX/jEiyq/0bX8rh6uuxi6IbHOA3X2+0/TLZwa3Y3JeV4Wrgn\n\trSGAeNvEscgBfQXwMGVKG6euijATTwBIGLK8aWRTnXV5S9gBnrdmftnVpc+QystA49\n\tQO4OvHsacltLveJ5oM0aTXkxbsGEw8mpXIUJGIlY=","Date":"Tue, 30 Jun 2020 00:46:03 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"<20200629214603.GA21452@pendragon.ideasonboard.com>","References":"<20200629151411.216477-1-paul.elder@ideasonboard.com>\n\t<20200629151411.216477-4-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200629151411.216477-4-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 3/6] libcamera: formats:\n\tPixelFormatInfo: Add v4l2 constructor","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\" "}}]