Patch Detail
Show a patch.
GET /api/1.1/patches/8623/?format=api
{ "id": 8623, "url": "https://patchwork.libcamera.org/api/1.1/patches/8623/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8623/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200704133140.1738660-3-paul.elder@ideasonboard.com>", "date": "2020-07-04T13:31:20", "name": "[libcamera-devel,v3,02/22] libcamera: formats: Add fields to info to ease calculating stride", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "9ae260f53cfc0d63dbffc8a7bd4e9aaa6188743f", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8623/mbox/", "series": [ { "id": 1083, "url": "https://patchwork.libcamera.org/api/1.1/series/1083/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1083", "date": "2020-07-04T13:31:18", "name": "Clean up formats in v4l2-compat and pipeline handlers", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1083/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8623/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8623/checks/", "tags": {}, "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 D5F3DBD792\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 4 Jul 2020 13:32:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A2E4760E18;\n\tSat, 4 Jul 2020 15:32:00 +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 3831460C50\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 4 Jul 2020 15:31:59 +0200 (CEST)", "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 A0A6A296;\n\tSat, 4 Jul 2020 15:31:57 +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=\"jkqPo0xZ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593869518;\n\tbh=krJg3opTTIZeHuyLElEvSwxi8+aiPKN/qKLkaBncKAQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=jkqPo0xZflYMYr73wKneUXslytIvh+24USSqumcNOQbK9dKCqkepUPjwGvgVu2snV\n\tcXwsPVEVPhzlb60JcNr2FOqb0W2uDdu3l+fKyc3VwVfDKqieyvZBwoGgzYKCkaCNdU\n\tw7wFH1DWkQyjykDieurSY5Y1Uvo3XIfYpcRI5x8s=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 4 Jul 2020 22:31:20 +0900", "Message-Id": "<20200704133140.1738660-3-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20200704133140.1738660-1-paul.elder@ideasonboard.com>", "References": "<20200704133140.1738660-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 02/22] libcamera: formats: Add fields\n\tto info to ease calculating stride", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Packed formats make it difficult to calculate stride as well as\nframe size with the fields that PixelFormatInfo currently has.\nbitsPerPixel is defined as the average number of bits per pixel, and\nonly counts effective bits, so it is not useful for calculating\nstride and frame size.\n\nTo fix this, we introduce a concept of a \"pixel group\". The size of this\ngroup is defined as the minimum number of pixels (including padding)\nnecessary in a row when the image has only one column of effective\npixels. The pixel group has one more attribute, that is the \"bytes per\ngroup\". This determines how many bytes one pixel group consumes. These\nare the fields pixelsPerGroup and bytesPerGroup that are defined in this\npatch. Defining these two values makes it really simple to calculate\nbytes-per-line, as ceil(width / pixelsPerGroup) * bytesPerGroup, where\nwidth is measured in number of pixels. The ceiling accounts for padding.\n\nClearly, pixelsPerGroup must be constant for all planes in the format.\nThe bytesPerGroup then, must be a per-plane attribute. There is one more\nfield, verticalSubSampling, that is per-plane. This is simply a divider,\nto divide the number of rows of pixels by the sub-sampling value, to\nobtain the number of rows of pixels for the subsampled plane.\n\nFor example, for something simple like BGR888, it is self-explanatory:\nthe pixel group size is 1, and the bytes necessary is 3, and there is\nonly one plane with no (= 1) vertical subsampling. For YUYV, the\nCbCr pair is shared between two pixels, so even if you have only one\npixel, you would still need a padded second Y, therefore the pixel\ngroup size is 2, and bytes necessary is 4 (as opposed to 1 and 2). YUYV\nalso has no vertical subsampling. NV12 has a pixel group size of 2\npixels, due to the CbCr plane. The bytes per group then, for both\nplanes, is 2. The first plane has no vertical subsampling, but the\nsecond plane is subsampled by a factor of 2.\nThe IPU3 formats are also self-explanatory, as they are single-planar,\nand have a pixel group size of 25, consuming 32 bytes. Although a\ncomment in the driver suggests that it should be 50 and 64,\nrespectively, this is an attribute of the driver, and not the format, so\nthis shall be set by the ipu3 pipeline handler.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nChanges in v3:\n- add planes\n- redefine the parameters for the formats\n - pixelsPerGroup is for whole format\n - add verticalSubSampling per plane\n\nChanges in v2:\n- add documentation for bytesPerGroup pixelsPerGroup\n- fix wording in commit message\n - bytes-per-line -> stride\n - buffer size -> frame size\n- changed MJPEG todo to allowing pipeline handlers to set parameters of\n format infos\n---\n include/libcamera/internal/formats.h | 11 ++-\n src/libcamera/formats.cpp | 128 ++++++++++++++++++++++++++-\n 2 files changed, 137 insertions(+), 2 deletions(-)", "diff": "diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\nindex f59ac8f..ebd256c 100644\n--- a/include/libcamera/internal/formats.h\n+++ b/include/libcamera/internal/formats.h\n@@ -32,6 +32,12 @@ private:\n \tstd::map<unsigned int, std::vector<SizeRange>> data_;\n };\n \n+struct PixelFormatPlane\n+{\n+\tunsigned int bytesPerGroup;\n+\tunsigned int verticalSubSampling;\n+};\n+\n class PixelFormatInfo\n {\n public:\n@@ -45,13 +51,16 @@ public:\n \n \tstatic const PixelFormatInfo &info(const PixelFormat &format);\n \n-\t/* \\todo Add support for non-contiguous memory planes */\n \tconst char *name;\n \tPixelFormat format;\n \tV4L2PixelFormat v4l2Format;\n \tunsigned int bitsPerPixel;\n \tenum ColourEncoding colourEncoding;\n \tbool packed;\n+\n+\tunsigned int pixelsPerGroup;\n+\n+\tstd::array<PixelFormatPlane, 3> planes;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex d3b722c..6bdd28d 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -110,6 +110,22 @@ const std::map<unsigned int, std::vector<SizeRange>> &ImageFormats::data() const\n \treturn data_;\n }\n \n+/**\n+ * \\class PixelFormatPlane\n+ * \\brief Information about a single plane of a pixel format\n+ *\n+ * \\var PixelFormatPlane::bytesPerGroup\n+ * \\brief The number of bytes that a pixel group consumes\n+ *\n+ * \\sa PixelFormatInfo::pixelsPerGroup\n+ *\n+ * \\var PixelFormatPlane::verticalSubSampling\n+ * \\brief Vertical subsampling multiplier\n+ *\n+ * This value is the ratio between the number of rows of pixels in the frame\n+ * to the number of rows of pixels in the plane.\n+ */\n+\n /**\n * \\class PixelFormatInfo\n * \\brief Information about pixel formats\n@@ -152,6 +168,26 @@ const std::map<unsigned int, std::vector<SizeRange>> &ImageFormats::data() const\n * bytes. For instance, 12-bit Bayer data with two pixels stored in three bytes\n * is packed, while the same data stored with 4 bits of padding in two bytes\n * per pixel is not packed.\n+ *\n+ * \\var PixelFormatInfo::pixelsPerGroup\n+ * \\brief The number of pixels in a pixel group\n+ *\n+ * The minimum number of pixels (including padding) necessary in a row\n+ * when the frame has only one column of effective pixels\n+ *\n+ * A pixel group is defined as the minimum number of pixels (including padding)\n+ * necessary in a row when the image has only one column of effective pixels.\n+ * pixelsPerGroup refers to this value. bytesPerGroup, then, refers to the\n+ * number of bytes that a pixel group consumes. This definition of a pixel\n+ * group allows simple calculation of stride, as\n+ * ceil(width / pixelsPerGroup) * bytesPerGroup. These values are determined\n+ * only in terms of a row, and include bytes that are used in all planes (for\n+ * multiplanar formats).\n+ *\n+ * \\var PixelFormatInfo::planes\n+ * \\brief Information about pixels for each plane\n+ *\n+ * \\sa PixelFormatPlane\n */\n \n /**\n@@ -179,6 +215,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 24,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::RGB888, {\n \t\t.name = \"RGB888\",\n@@ -187,6 +225,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 24,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::ABGR8888, {\n \t\t.name = \"ABGR8888\",\n@@ -195,6 +235,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 32,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::ARGB8888, {\n \t\t.name = \"ARGB8888\",\n@@ -203,6 +245,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 32,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::BGRA8888, {\n \t\t.name = \"BGRA8888\",\n@@ -211,6 +255,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 32,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::RGBA8888, {\n \t\t.name = \"RGBA8888\",\n@@ -219,6 +265,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 32,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRGB,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \n \t/* YUV packed formats. */\n@@ -229,6 +277,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 16,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::YVYU, {\n \t\t.name = \"YVYU\",\n@@ -237,6 +287,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 16,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::UYVY, {\n \t\t.name = \"UYVY\",\n@@ -245,6 +297,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 16,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::VYUY, {\n \t\t.name = \"VYUY\",\n@@ -253,6 +307,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 16,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \n \t/* YUV planar formats. */\n@@ -263,6 +319,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 2, 2 }, { 0, 0 } }},\n \t} },\n \t{ formats::NV21, {\n \t\t.name = \"NV21\",\n@@ -271,6 +329,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 2, 2 }, { 0, 0 } }},\n \t} },\n \t{ formats::NV16, {\n \t\t.name = \"NV16\",\n@@ -279,6 +339,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 16,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 2, 1 }, { 0, 0 } }},\n \t} },\n \t{ formats::NV61, {\n \t\t.name = \"NV61\",\n@@ -287,6 +349,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 16,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 2, 1 }, { 0, 0 } }},\n \t} },\n \t{ formats::NV24, {\n \t\t.name = \"NV24\",\n@@ -295,6 +359,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 24,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 1, 1 }, { 2, 1 }, { 0, 0 } }},\n \t} },\n \t{ formats::NV42, {\n \t\t.name = \"NV42\",\n@@ -303,6 +369,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 24,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 1, 1 }, { 2, 1 }, { 0, 0 } }},\n \t} },\n \t{ formats::YUV420, {\n \t\t.name = \"YUV420\",\n@@ -311,6 +379,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 1, 2 }, { 1, 2 } }},\n \t} },\n \t{ formats::YUV422, {\n \t\t.name = \"YUV422\",\n@@ -319,6 +389,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 16,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 1, 1 }, { 1, 1 } }},\n \t} },\n \n \t/* Greyscale formats. */\n@@ -329,6 +401,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 8,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingYUV,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 1,\n+\t\t.planes = {{ { 1, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \n \t/* Bayer formats. */\n@@ -339,6 +413,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 8,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGBRG8, {\n \t\t.name = \"SGBRG8\",\n@@ -347,6 +423,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 8,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGRBG8, {\n \t\t.name = \"SGRBG8\",\n@@ -355,6 +433,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 8,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SRGGB8, {\n \t\t.name = \"SRGGB8\",\n@@ -363,6 +443,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 8,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 2, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SBGGR10, {\n \t\t.name = \"SBGGR10\",\n@@ -371,6 +453,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGBRG10, {\n \t\t.name = \"SGBRG10\",\n@@ -379,6 +463,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGRBG10, {\n \t\t.name = \"SGRBG10\",\n@@ -387,6 +473,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SRGGB10, {\n \t\t.name = \"SRGGB10\",\n@@ -395,6 +483,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SBGGR10_CSI2P, {\n \t\t.name = \"SBGGR10_CSI2P\",\n@@ -403,6 +493,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 4,\n+\t\t.planes = {{ { 5, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGBRG10_CSI2P, {\n \t\t.name = \"SGBRG10_CSI2P\",\n@@ -411,6 +503,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 4,\n+\t\t.planes = {{ { 5, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGRBG10_CSI2P, {\n \t\t.name = \"SGRBG10_CSI2P\",\n@@ -419,6 +513,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 4,\n+\t\t.planes = {{ { 5, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SRGGB10_CSI2P, {\n \t\t.name = \"SRGGB10_CSI2P\",\n@@ -427,6 +523,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 4,\n+\t\t.planes = {{ { 5, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SBGGR12, {\n \t\t.name = \"SBGGR12\",\n@@ -435,6 +533,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGBRG12, {\n \t\t.name = \"SGBRG12\",\n@@ -443,6 +543,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGRBG12, {\n \t\t.name = \"SGRBG12\",\n@@ -451,6 +553,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SRGGB12, {\n \t\t.name = \"SRGGB12\",\n@@ -459,6 +563,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = false,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 4, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SBGGR12_CSI2P, {\n \t\t.name = \"SBGGR12_CSI2P\",\n@@ -467,6 +573,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGBRG12_CSI2P, {\n \t\t.name = \"SGBRG12_CSI2P\",\n@@ -475,6 +583,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGRBG12_CSI2P, {\n \t\t.name = \"SGRBG12_CSI2P\",\n@@ -483,6 +593,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SRGGB12_CSI2P, {\n \t\t.name = \"SRGGB12_CSI2P\",\n@@ -491,6 +603,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 12,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 2,\n+\t\t.planes = {{ { 3, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SBGGR10_IPU3, {\n \t\t.name = \"SBGGR10_IPU3\",\n@@ -499,6 +613,9 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t/* \\todo remember to double this in the ipu3 pipeline handler */\n+\t\t.pixelsPerGroup = 25,\n+\t\t.planes = {{ { 32, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGBRG10_IPU3, {\n \t\t.name = \"SGBRG10_IPU3\",\n@@ -507,6 +624,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 25,\n+\t\t.planes = {{ { 32, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SGRBG10_IPU3, {\n \t\t.name = \"SGRBG10_IPU3\",\n@@ -515,6 +634,8 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 25,\n+\t\t.planes = {{ { 32, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \t{ formats::SRGGB10_IPU3, {\n \t\t.name = \"SRGGB10_IPU3\",\n@@ -523,16 +644,21 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.bitsPerPixel = 10,\n \t\t.colourEncoding = PixelFormatInfo::ColourEncodingRAW,\n \t\t.packed = true,\n+\t\t.pixelsPerGroup = 25,\n+\t\t.planes = {{ { 32, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n \n \t/* Compressed formats. */\n+\t/* \\todo remember to fill this in from the pipeline handler. */\n \t{ formats::MJPEG, {\n \t\t.name = \"MJPEG\",\n \t\t.format = formats::MJPEG,\n \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_MJPEG),\n-\t\t.bitsPerPixel = 0,\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 = {{ { 1, 1 }, { 0, 0 }, { 0, 0 } }},\n \t} },\n };\n \n", "prefixes": [ "libcamera-devel", "v3", "02/22" ] }