[{"id":14388,"web_url":"https://patchwork.libcamera.org/comment/14388/","msgid":"<20201229044819.GH67590@pyrite.rasen.tech>","date":"2020-12-29T04:48:19","subject":"Re: [libcamera-devel] [PATCH v2 2/5] libcamera: bayer_format: Add\n\tsupport for mbus codes","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Mon, Dec 28, 2020 at 05:40:00PM +0100, Jacopo Mondi wrote:\n> The existing implementation of the BayerFormat class supports\n> converting a V4L2PixelFormat to a BayerFormat and vice-versa.\n> \n> Expand the class by adding support for converting a media bus code\n> to a BayerFormat instance, by providing a conversion table and a\n> dedicated static methods.\n> \n> Do not provide support for converting a BayerFormat to a media bus code\n> as there's no 1-to-1 mapping between the two.\n> \n> Reviewed-by: Laurent Pinchart \n> Reviewed-by: Niklas Söderlund \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Paul Elder \n\n> ---\n> include/libcamera/internal/bayer_format.h | 1 +\n> src/libcamera/bayer_format.cpp | 55 +++++++++++++++++++++++\n> 2 files changed, 56 insertions(+)\n> \n> diff --git a/include/libcamera/internal/bayer_format.h b/include/libcamera/internal/bayer_format.h\n> index 4280b76b016f..dc86f6ee3aca 100644\n> --- a/include/libcamera/internal/bayer_format.h\n> +++ b/include/libcamera/internal/bayer_format.h\n> @@ -43,6 +43,7 @@ public:\n> \t}\n> \n> \texplicit BayerFormat(V4L2PixelFormat v4l2Format);\n> +\tstatic const BayerFormat &fromMbusCode(unsigned int mbusCode);\n> \tbool isValid() const { return bitDepth != 0; }\n> \n> \tstd::string toString() const;\n> diff --git a/src/libcamera/bayer_format.cpp b/src/libcamera/bayer_format.cpp\n> index c42792ff1948..a6a40be0571d 100644\n> --- a/src/libcamera/bayer_format.cpp\n> +++ b/src/libcamera/bayer_format.cpp\n> @@ -8,6 +8,9 @@\n> #include \"libcamera/internal/bayer_format.h\"\n> \n> #include \n> +#include \n> +\n> +#include \n> \n> #include \n> \n> @@ -140,6 +143,41 @@ const std::map bayerToV4l2{\n> \t{ { BayerFormat::RGGB, 16, BayerFormat::None }, V4L2PixelFormat(V4L2_PIX_FMT_SRGGB16) },\n> };\n> \n> +const std::unordered_map mbusCodeToBayer{\n> +\t{ MEDIA_BUS_FMT_SBGGR8_1X8, { BayerFormat::BGGR, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGBRG8_1X8, { BayerFormat::GBRG, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGRBG8_1X8, { BayerFormat::GRBG, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SRGGB8_1X8, { BayerFormat::RGGB, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR10_ALAW8_1X8, { BayerFormat::BGGR, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGBRG10_ALAW8_1X8, { BayerFormat::GBRG, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8, { BayerFormat::GRBG, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SRGGB10_ALAW8_1X8, { BayerFormat::RGGB, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8, { BayerFormat::BGGR, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8, { BayerFormat::GBRG, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8, { BayerFormat::GRBG, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8, { BayerFormat::RGGB, 8, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE, { BayerFormat::BGGR, 10, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, { BayerFormat::BGGR, 10, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE, { BayerFormat::BGGR, 10, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE, { BayerFormat::BGGR, 10, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR10_1X10, { BayerFormat::BGGR, 10, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGBRG10_1X10, { BayerFormat::GBRG, 10, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGRBG10_1X10, { BayerFormat::GRBG, 10, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SRGGB10_1X10, { BayerFormat::RGGB, 10, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR12_1X12, { BayerFormat::BGGR, 12, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGBRG12_1X12, { BayerFormat::GBRG, 12, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGRBG12_1X12, { BayerFormat::GRBG, 12, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SRGGB12_1X12, { BayerFormat::RGGB, 12, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR14_1X14, { BayerFormat::BGGR, 14, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGBRG14_1X14, { BayerFormat::GBRG, 14, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGRBG14_1X14, { BayerFormat::GRBG, 14, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SRGGB14_1X14, { BayerFormat::RGGB, 14, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SBGGR16_1X16, { BayerFormat::BGGR, 16, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGBRG16_1X16, { BayerFormat::GBRG, 16, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SGRBG16_1X16, { BayerFormat::GRBG, 16, BayerFormat::None } },\n> +\t{ MEDIA_BUS_FMT_SRGGB16_1X16, { BayerFormat::RGGB, 16, BayerFormat::None } },\n> +};\n> +\n> } /* namespace */\n> \n> /**\n> @@ -169,6 +207,23 @@ BayerFormat::BayerFormat(V4L2PixelFormat v4l2Format)\n> \t\t*this = it->second;\n> }\n> \n> +/**\n> + * \\brief Retrieve the BayerFormat associated with a media bus code\n> + * \\param[in] mbusCode The media bus code to convert into a BayerFormat\n> + *\n> + * The media bus code numeric identifiers are defined by the V4L2 specification.\n> + */\n> +const BayerFormat &BayerFormat::fromMbusCode(unsigned int mbusCode)\n> +{\n> +\tstatic BayerFormat empty;\n> +\n> +\tconst auto it = mbusCodeToBayer.find(mbusCode);\n> +\tif (it == mbusCodeToBayer.end())\n> +\t\treturn empty;\n> +\telse\n> +\t\treturn it->second;\n> +}\n> +\n> /**\n> * \\fn BayerFormat::isValid()\n> * \\brief Return whether a BayerFormat is valid\n> -- \n> 2.29.2\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 1C7CBC0F1C\n\tfor ;\n\tTue, 29 Dec 2020 04:48:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9A82D615B4;\n\tTue, 29 Dec 2020 05:48:28 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5DD696031F\n\tfor ;\n\tTue, 29 Dec 2020 05:48:27 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CEB2098;\n\tTue, 29 Dec 2020 05:48:25 +0100 (CET)"],"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=\"Q6G1cOz6\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1609217307;\n\tbh=l/OKmjxJqHBiDCWub/8ye1SOEkSbrGMYfWXQguMj/L0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Q6G1cOz6pqGBxAEyF8awscO0Sm6zImeFZ80UEpoB+oVHGWi8zHwQDVgSQhH/MOxT6\n\tZKwk3T4I1EeKdvhwzKxctg5oQ5Cat4XOR5Tz+OLNupx8QSXh+anLtLkb6lW3hH67Zm\n\tafBkGO3zJD8SpZCiA6AB1agehylgWPlmFFNenZ/w=","Date":"Tue, 29 Dec 2020 13:48:19 +0900","From":"paul.elder@ideasonboard.com","To":"Jacopo Mondi ","Message-ID":"<20201229044819.GH67590@pyrite.rasen.tech>","References":"<20201228164003.53051-1-jacopo@jmondi.org>\n\t<20201228164003.53051-3-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201228164003.53051-3-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v2 2/5] libcamera: bayer_format: Add\n\tsupport for mbus codes","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=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]