[{"id":28592,"web_url":"https://patchwork.libcamera.org/comment/28592/","msgid":"<20240123133704.GE32612@pendragon.ideasonboard.com>","date":"2024-01-23T13:37:04","subject":"Re: [PATCH] libcamera: formats: Add 16-bit mono format","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Tue, Jan 23, 2024 at 01:34:10PM +0000, Kieran Bingham wrote:\n> From: Naushir Patuck <naush@raspberrypi.com>\n> \n> Add the relevant definitions for a 16-bit mono pixel and media-bus\n> format.\n> \n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> ---\n> \n> Patch cherry-picked from\n> https://github.com/raspberrypi/libcamera/commit/d8c775077c33f7475c5d4828ce3e374d5769b59c\n> and rebased on top of the recent df770d4b0a6d (\"include: linux: Update\n> kernel headers to version v6.7\".\n> \n> \n>  src/libcamera/bayer_format.cpp     |  3 +++\n>  src/libcamera/formats.cpp          | 10 ++++++++++\n>  src/libcamera/formats.yaml         |  2 ++\n>  src/libcamera/v4l2_pixelformat.cpp |  2 ++\n>  src/libcamera/v4l2_subdevice.cpp   |  1 +\n>  5 files changed, 18 insertions(+)\n> \n> diff --git a/src/libcamera/bayer_format.cpp b/src/libcamera/bayer_format.cpp\n> index 3bf15fb48f36..2f55d33a915d 100644\n> --- a/src/libcamera/bayer_format.cpp\n> +++ b/src/libcamera/bayer_format.cpp\n> @@ -168,8 +168,11 @@ const std::map<BayerFormat, Formats, BayerFormatComparator> bayerToFormat{\n>  \t\t{ formats::R8, V4L2PixelFormat(V4L2_PIX_FMT_GREY) } },\n>  \t{ { BayerFormat::MONO, 10, BayerFormat::Packing::None },\n>  \t\t{ formats::R10, V4L2PixelFormat(V4L2_PIX_FMT_Y10) } },\n> +\t{ { BayerFormat::MONO, 16, BayerFormat::Packing::None },\n> +\t\t{ formats::R16, V4L2PixelFormat(V4L2_PIX_FMT_Y16) } },\n\nI would move the 16-bit format after the packed 10-bit format, like we\ndo for the Bayer formats. Same below.\n\n>  \t{ { BayerFormat::MONO, 10, BayerFormat::Packing::CSI2 },\n>  \t\t{ formats::R10_CSI2P, V4L2PixelFormat(V4L2_PIX_FMT_Y10P) } },\n> +\n\nDrop this.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nwith these fixed.\n\n>  };\n>  \n>  const std::unordered_map<unsigned int, BayerFormat> mbusCodeToBayer{\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 447e623803c7..46ccd43ba63a 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -507,6 +507,16 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n>  \t\t.pixelsPerGroup = 1,\n>  \t\t.planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n>  \t} },\n> +\t{ formats::R16, {\n> +\t\t.name = \"R16\",\n> +\t\t.format = formats::R16,\n> +\t\t.v4l2Formats = { V4L2PixelFormat(V4L2_PIX_FMT_Y16), },\n> +\t\t.bitsPerPixel = 16,\n> +\t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n> +\t\t.packed = false,\n> +\t\t.pixelsPerGroup = 1,\n> +\t\t.planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n> +\t} },\n>  \t{ formats::R10_CSI2P, {\n>  \t\t.name = \"R10_CSI2P\",\n>  \t\t.format = formats::R10_CSI2P,\n> diff --git a/src/libcamera/formats.yaml b/src/libcamera/formats.yaml\n> index 539ac0b33084..d8a379923b56 100644\n> --- a/src/libcamera/formats.yaml\n> +++ b/src/libcamera/formats.yaml\n> @@ -11,6 +11,8 @@ formats:\n>        fourcc: DRM_FORMAT_R10\n>    - R12:\n>        fourcc: DRM_FORMAT_R12\n> +  - R16:\n> +      fourcc: DRM_FORMAT_R16\n>  \n>    - RGB565:\n>        fourcc: DRM_FORMAT_RGB565\n> diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\n> index 5551c62eb39b..731dc10f1d73 100644\n> --- a/src/libcamera/v4l2_pixelformat.cpp\n> +++ b/src/libcamera/v4l2_pixelformat.cpp\n> @@ -135,6 +135,8 @@ const std::map<V4L2PixelFormat, V4L2PixelFormat::Info> vpf2pf{\n>  \t\t{ formats::R10_CSI2P, \"10-bit Greyscale Packed\" } },\n>  \t{ V4L2PixelFormat(V4L2_PIX_FMT_Y12),\n>  \t\t{ formats::R12, \"12-bit Greyscale\" } },\n> +\t{ V4L2PixelFormat(V4L2_PIX_FMT_Y16),\n> +\t\t{ formats::R16, \"16-bit Greyscale\" } },\n>  \n>  \t/* Bayer formats. */\n>  \t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8),\n> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> index 75ad11e55272..265240dbd405 100644\n> --- a/src/libcamera/v4l2_subdevice.cpp\n> +++ b/src/libcamera/v4l2_subdevice.cpp\n> @@ -88,6 +88,7 @@ const std::map<uint32_t, V4L2SubdeviceFormatInfo> formatInfoMap = {\n>  \t{ MEDIA_BUS_FMT_YUYV10_2X10, { 20, \"YUYV10_2X10\", PixelFormatInfo::ColourEncodingYUV } },\n>  \t{ MEDIA_BUS_FMT_YVYU10_2X10, { 20, \"YVYU10_2X10\", PixelFormatInfo::ColourEncodingYUV } },\n>  \t{ MEDIA_BUS_FMT_Y12_1X12, { 12, \"Y12_1X12\", PixelFormatInfo::ColourEncodingYUV } },\n> +\t{ MEDIA_BUS_FMT_Y16_1X16, { 16, \"Y16_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n>  \t{ MEDIA_BUS_FMT_UYVY8_1X16, { 16, \"UYVY8_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n>  \t{ MEDIA_BUS_FMT_VYUY8_1X16, { 16, \"VYUY8_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n>  \t{ MEDIA_BUS_FMT_YUYV8_1X16, { 16, \"YUYV8_1X16\", PixelFormatInfo::ColourEncodingYUV } },","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 CF707C323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Jan 2024 13:37:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 35BEF6291F;\n\tTue, 23 Jan 2024 14:37:08 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 73F0862916\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Jan 2024 14:37:06 +0100 (CET)","from pendragon.ideasonboard.com (89-27-53-110.bb.dnainternet.fi\n\t[89.27.53.110])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B9C4322DD;\n\tTue, 23 Jan 2024 14:35:52 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"JQIjIboB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1706016952;\n\tbh=cT4fJkb9vsGmMz6KpHfvu8GIrW23JUUDZG9sjGKuDsw=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=JQIjIboB/3j1dNMuNS9xumKhKpJgBXn6MyoUx7XlmkxVDqAjUzcIbdQSj4GdRA+Tf\n\tGjoiyaeTyIZxONJFVEUZvRL4ZI1ZDsSCpcvf0TSOX2vPQ5tKww5m5n3jflAz9bbK91\n\tWXgUTV+a8Qb9j3y5KCpqCm29VUwRS+f0R/7q03FQ=","Date":"Tue, 23 Jan 2024 15:37:04 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Subject":"Re: [PATCH] libcamera: formats: Add 16-bit mono format","Message-ID":"<20240123133704.GE32612@pendragon.ideasonboard.com>","References":"<20240123133410.4130945-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240123133410.4130945-1-kieran.bingham@ideasonboard.com>","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera devel <libcamera-devel@lists.libcamera.org>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":28594,"web_url":"https://patchwork.libcamera.org/comment/28594/","msgid":"<170601769369.3044059.2726618159445794888@ping.linuxembedded.co.uk>","date":"2024-01-23T13:48:13","subject":"Re: [PATCH] libcamera: formats: Add 16-bit mono format","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Kieran Bingham (2024-01-23 13:34:10)\n> From: Naushir Patuck <naush@raspberrypi.com>\n> \n> Add the relevant definitions for a 16-bit mono pixel and media-bus\n> format.\n> \n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> ---\n> \n> Patch cherry-picked from\n> https://github.com/raspberrypi/libcamera/commit/d8c775077c33f7475c5d4828ce3e374d5769b59c\n> and rebased on top of the recent df770d4b0a6d (\"include: linux: Update\n> kernel headers to version v6.7\".\n\nAlso, this will solve/fix https://github.com/raspberrypi/libcamera/issues/103\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> \n> \n>  src/libcamera/bayer_format.cpp     |  3 +++\n>  src/libcamera/formats.cpp          | 10 ++++++++++\n>  src/libcamera/formats.yaml         |  2 ++\n>  src/libcamera/v4l2_pixelformat.cpp |  2 ++\n>  src/libcamera/v4l2_subdevice.cpp   |  1 +\n>  5 files changed, 18 insertions(+)\n> \n> diff --git a/src/libcamera/bayer_format.cpp b/src/libcamera/bayer_format.cpp\n> index 3bf15fb48f36..2f55d33a915d 100644\n> --- a/src/libcamera/bayer_format.cpp\n> +++ b/src/libcamera/bayer_format.cpp\n> @@ -168,8 +168,11 @@ const std::map<BayerFormat, Formats, BayerFormatComparator> bayerToFormat{\n>                 { formats::R8, V4L2PixelFormat(V4L2_PIX_FMT_GREY) } },\n>         { { BayerFormat::MONO, 10, BayerFormat::Packing::None },\n>                 { formats::R10, V4L2PixelFormat(V4L2_PIX_FMT_Y10) } },\n\nIt looks like V4L2_PIX_FMT_Y12 might be missing here.\nNot specifically for this patch though.\n\n> +       { { BayerFormat::MONO, 16, BayerFormat::Packing::None },\n> +               { formats::R16, V4L2PixelFormat(V4L2_PIX_FMT_Y16) } },\n>         { { BayerFormat::MONO, 10, BayerFormat::Packing::CSI2 },\n>                 { formats::R10_CSI2P, V4L2PixelFormat(V4L2_PIX_FMT_Y10P) } },\n> +\n\nNo blank line required.\nCan be dropped while applying.\n\n\n>  };\n>  \n>  const std::unordered_map<unsigned int, BayerFormat> mbusCodeToBayer{\n> diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> index 447e623803c7..46ccd43ba63a 100644\n> --- a/src/libcamera/formats.cpp\n> +++ b/src/libcamera/formats.cpp\n> @@ -507,6 +507,16 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n>                 .pixelsPerGroup = 1,\n>                 .planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n>         } },\n\nThe one above here is R12.\n\nLooks like R14 support could be added throughout. (separately).\n\nSo with only the excess blank line removed (while applying I think)\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n\n> +       { formats::R16, {\n> +               .name = \"R16\",\n> +               .format = formats::R16,\n> +               .v4l2Formats = { V4L2PixelFormat(V4L2_PIX_FMT_Y16), },\n> +               .bitsPerPixel = 16,\n> +               .colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n> +               .packed = false,\n> +               .pixelsPerGroup = 1,\n> +               .planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n> +       } },\n>         { formats::R10_CSI2P, {\n>                 .name = \"R10_CSI2P\",\n>                 .format = formats::R10_CSI2P,\n> diff --git a/src/libcamera/formats.yaml b/src/libcamera/formats.yaml\n> index 539ac0b33084..d8a379923b56 100644\n> --- a/src/libcamera/formats.yaml\n> +++ b/src/libcamera/formats.yaml\n> @@ -11,6 +11,8 @@ formats:\n>        fourcc: DRM_FORMAT_R10\n>    - R12:\n>        fourcc: DRM_FORMAT_R12\n> +  - R16:\n> +      fourcc: DRM_FORMAT_R16\n>  \n>    - RGB565:\n>        fourcc: DRM_FORMAT_RGB565\n> diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\n> index 5551c62eb39b..731dc10f1d73 100644\n> --- a/src/libcamera/v4l2_pixelformat.cpp\n> +++ b/src/libcamera/v4l2_pixelformat.cpp\n> @@ -135,6 +135,8 @@ const std::map<V4L2PixelFormat, V4L2PixelFormat::Info> vpf2pf{\n>                 { formats::R10_CSI2P, \"10-bit Greyscale Packed\" } },\n>         { V4L2PixelFormat(V4L2_PIX_FMT_Y12),\n>                 { formats::R12, \"12-bit Greyscale\" } },\n> +       { V4L2PixelFormat(V4L2_PIX_FMT_Y16),\n> +               { formats::R16, \"16-bit Greyscale\" } },\n>  \n>         /* Bayer formats. */\n>         { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8),\n> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> index 75ad11e55272..265240dbd405 100644\n> --- a/src/libcamera/v4l2_subdevice.cpp\n> +++ b/src/libcamera/v4l2_subdevice.cpp\n> @@ -88,6 +88,7 @@ const std::map<uint32_t, V4L2SubdeviceFormatInfo> formatInfoMap = {\n>         { MEDIA_BUS_FMT_YUYV10_2X10, { 20, \"YUYV10_2X10\", PixelFormatInfo::ColourEncodingYUV } },\n>         { MEDIA_BUS_FMT_YVYU10_2X10, { 20, \"YVYU10_2X10\", PixelFormatInfo::ColourEncodingYUV } },\n>         { MEDIA_BUS_FMT_Y12_1X12, { 12, \"Y12_1X12\", PixelFormatInfo::ColourEncodingYUV } },\n> +       { MEDIA_BUS_FMT_Y16_1X16, { 16, \"Y16_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n>         { MEDIA_BUS_FMT_UYVY8_1X16, { 16, \"UYVY8_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n>         { MEDIA_BUS_FMT_VYUY8_1X16, { 16, \"VYUY8_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n>         { MEDIA_BUS_FMT_YUYV8_1X16, { 16, \"YUYV8_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n> -- \n> 2.34.1\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 C6C6CC323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Jan 2024 13:48:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E176162946;\n\tTue, 23 Jan 2024 14:48:18 +0100 (CET)","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 D7471628E9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Jan 2024 14:48:16 +0100 (CET)","from pendragon.ideasonboard.com\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 171CC22DD;\n\tTue, 23 Jan 2024 14:47:03 +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=\"iu6DW4TQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1706017623;\n\tbh=MYPdh+oO+EkIS5H4BpTByyaHJlOTStHjV7E9Y7FydMU=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=iu6DW4TQPWLCI463CWkXcL/2SRd+HXovLHHXLPxIwH2H8UfXeU4/uqd0CBfzXwkDB\n\taRZpEy5EcmqTtO9yOQOPPxtwiOBbDllK020YBcyqnjIOiyZU8C8MkZnxfv3hlPlXgi\n\tNHHqDCkUlLyCiz30x861jCy1+AcQpsgRu5LjEwBU=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240123133410.4130945-1-kieran.bingham@ideasonboard.com>","References":"<20240123133410.4130945-1-kieran.bingham@ideasonboard.com>","Subject":"Re: [PATCH] libcamera: formats: Add 16-bit mono format","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","To":"libcamera devel <libcamera-devel@lists.libcamera.org>","Date":"Tue, 23 Jan 2024 13:48:13 +0000","Message-ID":"<170601769369.3044059.2726618159445794888@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":28595,"web_url":"https://patchwork.libcamera.org/comment/28595/","msgid":"<170601852844.3044059.16241733430944173371@ping.linuxembedded.co.uk>","date":"2024-01-23T14:02:08","subject":"Re: [PATCH] libcamera: formats: Add 16-bit mono format","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2024-01-23 13:37:04)\n> On Tue, Jan 23, 2024 at 01:34:10PM +0000, Kieran Bingham wrote:\n> > From: Naushir Patuck <naush@raspberrypi.com>\n> > \n> > Add the relevant definitions for a 16-bit mono pixel and media-bus\n> > format.\n> > \n> > Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n> > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> > ---\n> > \n> > Patch cherry-picked from\n> > https://github.com/raspberrypi/libcamera/commit/d8c775077c33f7475c5d4828ce3e374d5769b59c\n> > and rebased on top of the recent df770d4b0a6d (\"include: linux: Update\n> > kernel headers to version v6.7\".\n> > \n> > \n> >  src/libcamera/bayer_format.cpp     |  3 +++\n> >  src/libcamera/formats.cpp          | 10 ++++++++++\n> >  src/libcamera/formats.yaml         |  2 ++\n> >  src/libcamera/v4l2_pixelformat.cpp |  2 ++\n> >  src/libcamera/v4l2_subdevice.cpp   |  1 +\n> >  5 files changed, 18 insertions(+)\n> > \n> > diff --git a/src/libcamera/bayer_format.cpp b/src/libcamera/bayer_format.cpp\n> > index 3bf15fb48f36..2f55d33a915d 100644\n> > --- a/src/libcamera/bayer_format.cpp\n> > +++ b/src/libcamera/bayer_format.cpp\n> > @@ -168,8 +168,11 @@ const std::map<BayerFormat, Formats, BayerFormatComparator> bayerToFormat{\n> >               { formats::R8, V4L2PixelFormat(V4L2_PIX_FMT_GREY) } },\n> >       { { BayerFormat::MONO, 10, BayerFormat::Packing::None },\n> >               { formats::R10, V4L2PixelFormat(V4L2_PIX_FMT_Y10) } },\n> > +     { { BayerFormat::MONO, 16, BayerFormat::Packing::None },\n> > +             { formats::R16, V4L2PixelFormat(V4L2_PIX_FMT_Y16) } },\n> \n> I would move the 16-bit format after the packed 10-bit format, like we\n> do for the Bayer formats. Same below.\n\nDone.\n\n> \n> >       { { BayerFormat::MONO, 10, BayerFormat::Packing::CSI2 },\n> >               { formats::R10_CSI2P, V4L2PixelFormat(V4L2_PIX_FMT_Y10P) } },\n> > +\n> \n> Drop this.\n\nDone ;-)\n\n> \n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> \n> with these fixed.\n\n\nbayer_format.cpp should also be updated with:\n\n@@ -210,6 +210,7 @@ const std::unordered_map<unsigned int, BayerFormat> mbusCodeToBayer{\n        { MEDIA_BUS_FMT_Y8_1X8, { BayerFormat::MONO, 8, BayerFormat::Packing::None } },\n        { MEDIA_BUS_FMT_Y10_1X10, { BayerFormat::MONO, 10, BayerFormat::Packing::None } },\n        { MEDIA_BUS_FMT_Y12_1X12, { BayerFormat::MONO, 12, BayerFormat::Packing::None } },\n+       { MEDIA_BUS_FMT_Y16_1X16, { BayerFormat::MONO, 16, BayerFormat::Packing::None } },\n };\n\n } /* namespace */\n\n\nI'll send out a v2 anyway, and the ordering fixup and add in R14.\n\n\n\n> \n> >  };\n> >  \n> >  const std::unordered_map<unsigned int, BayerFormat> mbusCodeToBayer{\n> > diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\n> > index 447e623803c7..46ccd43ba63a 100644\n> > --- a/src/libcamera/formats.cpp\n> > +++ b/src/libcamera/formats.cpp\n> > @@ -507,6 +507,16 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n> >               .pixelsPerGroup = 1,\n> >               .planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n> >       } },\n> > +     { formats::R16, {\n> > +             .name = \"R16\",\n> > +             .format = formats::R16,\n> > +             .v4l2Formats = { V4L2PixelFormat(V4L2_PIX_FMT_Y16), },\n> > +             .bitsPerPixel = 16,\n> > +             .colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n> > +             .packed = false,\n> > +             .pixelsPerGroup = 1,\n> > +             .planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n> > +     } },\n\nMoving this 'after' won't fix the R10_CSI2P to be adjacent to the R10,\nso I'll move formats::R10_CSI2P separately.\n\n\n> >       { formats::R10_CSI2P, {\n> >               .name = \"R10_CSI2P\",\n> >               .format = formats::R10_CSI2P,\n> > diff --git a/src/libcamera/formats.yaml b/src/libcamera/formats.yaml\n> > index 539ac0b33084..d8a379923b56 100644\n> > --- a/src/libcamera/formats.yaml\n> > +++ b/src/libcamera/formats.yaml\n> > @@ -11,6 +11,8 @@ formats:\n> >        fourcc: DRM_FORMAT_R10\n> >    - R12:\n> >        fourcc: DRM_FORMAT_R12\n> > +  - R16:\n> > +      fourcc: DRM_FORMAT_R16\n> >  \n> >    - RGB565:\n> >        fourcc: DRM_FORMAT_RGB565\n> > diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\n> > index 5551c62eb39b..731dc10f1d73 100644\n> > --- a/src/libcamera/v4l2_pixelformat.cpp\n> > +++ b/src/libcamera/v4l2_pixelformat.cpp\n> > @@ -135,6 +135,8 @@ const std::map<V4L2PixelFormat, V4L2PixelFormat::Info> vpf2pf{\n> >               { formats::R10_CSI2P, \"10-bit Greyscale Packed\" } },\n> >       { V4L2PixelFormat(V4L2_PIX_FMT_Y12),\n> >               { formats::R12, \"12-bit Greyscale\" } },\n> > +     { V4L2PixelFormat(V4L2_PIX_FMT_Y16),\n> > +             { formats::R16, \"16-bit Greyscale\" } },\n> >  \n> >       /* Bayer formats. */\n> >       { V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8),\n> > diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> > index 75ad11e55272..265240dbd405 100644\n> > --- a/src/libcamera/v4l2_subdevice.cpp\n> > +++ b/src/libcamera/v4l2_subdevice.cpp\n> > @@ -88,6 +88,7 @@ const std::map<uint32_t, V4L2SubdeviceFormatInfo> formatInfoMap = {\n> >       { MEDIA_BUS_FMT_YUYV10_2X10, { 20, \"YUYV10_2X10\", PixelFormatInfo::ColourEncodingYUV } },\n> >       { MEDIA_BUS_FMT_YVYU10_2X10, { 20, \"YVYU10_2X10\", PixelFormatInfo::ColourEncodingYUV } },\n> >       { MEDIA_BUS_FMT_Y12_1X12, { 12, \"Y12_1X12\", PixelFormatInfo::ColourEncodingYUV } },\n> > +     { MEDIA_BUS_FMT_Y16_1X16, { 16, \"Y16_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n> >       { MEDIA_BUS_FMT_UYVY8_1X16, { 16, \"UYVY8_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n> >       { MEDIA_BUS_FMT_VYUY8_1X16, { 16, \"VYUY8_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n> >       { MEDIA_BUS_FMT_YUYV8_1X16, { 16, \"YUYV8_1X16\", PixelFormatInfo::ColourEncodingYUV } },\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 98F95BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Jan 2024 14:02:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D69DA62916;\n\tTue, 23 Jan 2024 15:02:12 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E0BFA628E9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Jan 2024 15:02:10 +0100 (CET)","from pendragon.ideasonboard.com\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 25159BEB;\n\tTue, 23 Jan 2024 15:00:57 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"f5Pcg0KF\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1706018457;\n\tbh=rWW62IjQG03KkU6m9tirjv/yWPfbHYq9NRAQIACBwDk=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=f5Pcg0KFErSKVdS8c0RB4ECUwP9rejecG8hb4axm/ZWO1JFnFAVgQ00uyRpExJVj/\n\tRXRAgGTC2wwa7qt0YthFF26lsXQdqYPWztdq+X2mrbkzBbbuGa3AtO33r3oTihz5yP\n\t0IJBA21tiFWgyOg+XLNgi5PFxeiJFTAiJj+LbvGE=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240123133704.GE32612@pendragon.ideasonboard.com>","References":"<20240123133410.4130945-1-kieran.bingham@ideasonboard.com>\n\t<20240123133704.GE32612@pendragon.ideasonboard.com>","Subject":"Re: [PATCH] libcamera: formats: Add 16-bit mono format","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Date":"Tue, 23 Jan 2024 14:02:08 +0000","Message-ID":"<170601852844.3044059.16241733430944173371@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera devel <libcamera-devel@lists.libcamera.org>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]