[{"id":24248,"web_url":"https://patchwork.libcamera.org/comment/24248/","msgid":"","date":"2022-07-29T17:16:29","subject":"Re: [libcamera-devel] [PATCH v3 2/6] libcamera: formats: Search\n\tPixelFormatInfo on multiple formats","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\nOn Fri, Jul 29, 2022 at 06:00:10PM +0200, Jacopo Mondi via libcamera-devel wrote:\n> The PixelFormatInfo::info(const V4L2PixelFormat &format) function\n> returns the PixelFormatInfo associated with a V4L2 pixel format.\n> \n> To correctly support multiple V4L2 formats mapped to a single\n> PixelFormatInfo rework the function to search the given V4L2 format\n> in a list.\n> \n> Signed-off-by: Jacopo Mondi \n\nI think I'd squash this with 1/6.\n\n> ---\n> src/libcamera/formats.cpp | 13 +++++++++++--\n> 1 file changed, 11 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 3c536722f375..6921d5c43bcb 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -829,9 +829,18 @@ const PixelFormatInfo &PixelFormatInfo::info(const PixelFormat &format)\n> */\n> const PixelFormatInfo &PixelFormatInfo::info(const V4L2PixelFormat &format)\n> {\n> +\tauto matchFormats = [&format](const std::vector &formats) {\n> +\t\tconst auto &it = std::find_if(formats.begin(), formats.end(),\n> +\t\t\t\t\t [&format](const V4L2PixelFormat &fmt) {\n> +\t\t\t\t\t\t return format == fmt;\n> +\t\t\t\t\t });\n> +\n> +\t\treturn it != formats.end();\n\nYou can simplify this to\n\n\t\treturn std::find(formats.begin(), formats.end(), format)\n\t\t\t!= formats.end();\n\n> +\t};\n> +\n> \tconst auto &info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\n> -\t\t\t\t\t[format](auto pair) {\n> -\t\t\t\t\t\treturn pair.second.v4l2Formats[0] == format;\n> +\t\t\t\t\t[&matchFormats](auto &pair) {\n> +\t\t\t\t\t\treturn matchFormats(pair.second.v4l2Formats);\n> \t\t\t\t\t});\n\nOr possibly\n\n\tconst auto &info = std::find_if(pixelFormatInfo.begin(), pixelFormatInfo.end(),\n\t\t\t\t\t[](auto &pair) {\n\t\t\t\t\t\tconst auto &formats = pair.second.v4l2Formats;\n\t\t\t\t\t\treturn std::find(formats.begin(), formats.end(), format)\n\t\t\t\t\t\t\t!= formats.end();\n\t\t\t\t\t});\n\nActually, how about just reimplementing this function as\n\n\treturn info(format.toPixelFormat());\n\nas a 1/6 ? I think that would be more efficient, and would be simpler to\nmaintain.\n\n> \tif (info == pixelFormatInfo.end())\n> \t\treturn pixelFormatInfoInvalid;","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 BFFAFC3275\n\tfor ;\n\tFri, 29 Jul 2022 17:16:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2071A63312;\n\tFri, 29 Jul 2022 19:16:34 +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 AD09C603EC\n\tfor ;\n\tFri, 29 Jul 2022 19:16:32 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F11F66D4;\n\tFri, 29 Jul 2022 19:16:31 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659114994;\n\tbh=3GD8bFO3aNxr4/f6DffgLCXivVhe3wQI3kqnOunwYpQ=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=u4QcuewaKLNDdmciBbjcXuqsOXlCFn+D4K6XbvJ7a06ETbx+3I7gvuCt8gyFcfWsK\n\tRHRkN7ylnrMMmUGvvEsszlsz5laVPokXKnlFGlRA22jWNWQlsi2VZ+XOtBwzrSDbpO\n\tbdbcj7YIZDFkPQfMLrEDqETwCHnC6WVjLyIVNFjSSUIjCnFqwS75FGuzXVEFzAOhQL\n\tLx/uuavNmdjoWqGGZnzQejlS9blmxHApLLTQOYCxgn2sn/awrGNADGNWw72Il8I+ni\n\tBzgROkouR/iC6rD+GTOtPfCNXSQbfa7PVnohM2a21sn7ubGXes/ivS/hco7PCqXXY+\n\tquIVe1jghTkoA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1659114992;\n\tbh=3GD8bFO3aNxr4/f6DffgLCXivVhe3wQI3kqnOunwYpQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=WLhBItGZotkbfEyZqG9haOdMfl8HneLlvZI9lGAJEBGzGu9EG8udX4IhGSzeV2m1h\n\txK0Lm8nny2xCxJwfltoszY2d7hCrrNBcbFmNlCMqGyg9iNJ7R8fY8Az5G9gZsrgg53\n\tf9/cf2Xwge4B/Mp/3FjeqqJY8NgLTrJZeoWWtZdI="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"WLhBItGZ\"; dkim-atps=neutral","Date":"Fri, 29 Jul 2022 20:16:29 +0300","To":"Jacopo Mondi ","Message-ID":"","References":"<20220729160014.101503-1-jacopo@jmondi.org>\n\t<20220729160014.101503-3-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20220729160014.101503-3-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v3 2/6] libcamera: formats: Search\n\tPixelFormatInfo on multiple formats","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","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org, jozef@mlich.cz,\n\tPavel Machek ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]