Patch Detail
Show a patch.
GET /api/1.1/patches/3631/?format=api
{ "id": 3631, "url": "https://patchwork.libcamera.org/api/1.1/patches/3631/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3631/", "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": "<20200430030723.8908-6-laurent.pinchart@ideasonboard.com>", "date": "2020-04-30T03:07:22", "name": "[libcamera-devel,v2,5/6] libcamera: formats: Add support for 8-, 10- and 12-bit Bayer formats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "002ac9f4985f4ef2612fdeaa57e90eb6bf5ba24f", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3631/mbox/", "series": [ { "id": 858, "url": "https://patchwork.libcamera.org/api/1.1/series/858/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=858", "date": "2020-04-30T03:07:17", "name": "libcamera: Improve conversion between DRM and V4L2 formats", "version": 2, "mbox": "https://patchwork.libcamera.org/series/858/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3631/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3631/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "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 1B6056140E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Apr 2020 05:07:30 +0200 (CEST)", "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B32C472C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Apr 2020 05:07:29 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ICS1JXgj\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1588216049;\n\tbh=3bGDKeMUM1sVEPXT/hIfiZyJUP97NpuPb9ClwC7g1MA=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=ICS1JXgjTzcs2TM4RgF1zVAt4U0FzD7c8CQ2skkPbAL/1J4a21g5W8gLoAhuZSZvl\n\tO2hKYE4ODrmiEYn3ZQWqRiHOElkn6auUM+clzTQjZnptXAszUXCUAefFovB+hpalNC\n\t+DEQq1/proriLbOXuEUQAaQekAuK0G6XccNrWonc=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 30 Apr 2020 06:07:22 +0300", "Message-Id": "<20200430030723.8908-6-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.25.3", "In-Reply-To": "<20200430030723.8908-1-laurent.pinchart@ideasonboard.com>", "References": "<20200430030723.8908-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 5/6] libcamera: formats: Add support\n\tfor 8-, 10- and 12-bit Bayer formats", "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>", "X-List-Received-Date": "Thu, 30 Apr 2020 03:07:32 -0000" }, "content": "Add the 8-, 10- and 12-but Bayer formats, in both unpacked and\nMIPI-packed variants, to the format tables in PixelFormatInfo and\nV4L2PixelFormat.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/formats.cpp | 82 ++++++++++++++++++++++++++++++\n src/libcamera/v4l2_pixelformat.cpp | 30 +++++++++++\n 2 files changed, 112 insertions(+)", "diff": "diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex 4a351020b0d9..f6f8bc1202c2 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -194,6 +194,88 @@ const std::map<PixelFormat, PixelFormatInfo> pixelFormatInfo{\n \t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_GREY),\n \t} },\n \n+\t/* Bayer formats. */\n+\t{ PixelFormat(DRM_FORMAT_SBGGR8), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SBGGR8),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGBRG8), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGBRG8),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGRBG8), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGRBG8),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SRGGB8), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SRGGB8),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SBGGR10), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SBGGR10),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGBRG10), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGBRG10),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGRBG10), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGRBG10),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SRGGB10), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SRGGB10),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10P),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SBGGR12), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SBGGR12),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGBRG12), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGBRG12),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGRBG12), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGRBG12),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SRGGB12), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SRGGB12),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SBGGR12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SBGGR12, MIPI_FORMAT_MOD_CSI2_PACKED),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGBRG12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGBRG12, MIPI_FORMAT_MOD_CSI2_PACKED),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SGRBG12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SGRBG12, MIPI_FORMAT_MOD_CSI2_PACKED),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P),\n+\t} },\n+\t{ PixelFormat(DRM_FORMAT_SRGGB12, MIPI_FORMAT_MOD_CSI2_PACKED), {\n+\t\t.format = PixelFormat(DRM_FORMAT_SRGGB12, MIPI_FORMAT_MOD_CSI2_PACKED),\n+\t\t.v4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P),\n+\t} },\n+\n \t/* Compressed formats. */\n \t{ PixelFormat(DRM_FORMAT_MJPEG), {\n \t\t.format = PixelFormat(DRM_FORMAT_MJPEG),\ndiff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp\nindex 580c0fc9d983..fd7e2d286f3f 100644\n--- a/src/libcamera/v4l2_pixelformat.cpp\n+++ b/src/libcamera/v4l2_pixelformat.cpp\n@@ -68,6 +68,36 @@ const std::map<V4L2PixelFormat, PixelFormat> vpf2pf{\n \t/* Greyscale formats. */\n \t{ V4L2PixelFormat(V4L2_PIX_FMT_GREY), PixelFormat(DRM_FORMAT_R8) },\n \n+\t/* Bayer formats. */\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8), PixelFormat(DRM_FORMAT_SBGGR8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG8), PixelFormat(DRM_FORMAT_SGBRG8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG8), PixelFormat(DRM_FORMAT_SGRBG8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB8), PixelFormat(DRM_FORMAT_SRGGB8) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10), PixelFormat(DRM_FORMAT_SBGGR10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10), PixelFormat(DRM_FORMAT_SGBRG10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10), PixelFormat(DRM_FORMAT_SGRBG10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10), PixelFormat(DRM_FORMAT_SRGGB10) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR10),\n+\t PixelFormat(DRM_FORMAT_SBGGR10, MIPI_FORMAT_MOD_CSI2_PACKED) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG10P),\n+\t PixelFormat(DRM_FORMAT_SGBRG10, MIPI_FORMAT_MOD_CSI2_PACKED) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG10P),\n+\t PixelFormat(DRM_FORMAT_SGRBG10, MIPI_FORMAT_MOD_CSI2_PACKED) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB10P),\n+\t PixelFormat(DRM_FORMAT_SRGGB10, MIPI_FORMAT_MOD_CSI2_PACKED) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12), PixelFormat(DRM_FORMAT_SBGGR12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12), PixelFormat(DRM_FORMAT_SGBRG12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12), PixelFormat(DRM_FORMAT_SGRBG12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12), PixelFormat(DRM_FORMAT_SRGGB12) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SBGGR12P),\n+\t PixelFormat(DRM_FORMAT_SBGGR12, MIPI_FORMAT_MOD_CSI2_PACKED) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGBRG12P),\n+\t PixelFormat(DRM_FORMAT_SGBRG12, MIPI_FORMAT_MOD_CSI2_PACKED) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SGRBG12P),\n+\t PixelFormat(DRM_FORMAT_SGRBG12, MIPI_FORMAT_MOD_CSI2_PACKED) },\n+\t{ V4L2PixelFormat(V4L2_PIX_FMT_SRGGB12P),\n+\t PixelFormat(DRM_FORMAT_SRGGB12, MIPI_FORMAT_MOD_CSI2_PACKED) },\n+\n \t/* Compressed formats. */\n \t{ V4L2PixelFormat(V4L2_PIX_FMT_MJPEG), PixelFormat(DRM_FORMAT_MJPEG) },\n };\n", "prefixes": [ "libcamera-devel", "v2", "5/6" ] }