Patch Detail
Show a patch.
GET /api/patches/13686/?format=api
{ "id": 13686, "url": "https://patchwork.libcamera.org/api/patches/13686/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13686/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20210906225636.14683-23-laurent.pinchart@ideasonboard.com>", "date": "2021-09-06T22:56:29", "name": "[libcamera-devel,v3,23/30] cam: drm: Support per-plane stride values", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "788010a3ed2b62d0f478e5d47088e9f05b824dbc", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13686/mbox/", "series": [ { "id": 2482, "url": "https://patchwork.libcamera.org/api/series/2482/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2482", "date": "2021-09-06T22:54:20", "name": "libcamera: Handle fallout of FrameBuffer offset support", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2482/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13686/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13686/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 4935EBE175\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 6 Sep 2021 22:57:46 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DDC2569174;\n\tTue, 7 Sep 2021 00:57:45 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2FB6969175\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 7 Sep 2021 00:57:08 +0200 (CEST)", "from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B4E3B891;\n\tTue, 7 Sep 2021 00:57:07 +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=\"DRqXsUMT\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630969027;\n\tbh=bqyQIZd68Xh74j2UCky+WnVOGaSWdFIBWkZ5Es1xQRg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=DRqXsUMTDvSNIKKg3sr98rKOaFe0sSHzyS9uXYhCoNhm3JlE+XtSh5XLWjSkd+MRH\n\tdz4BM0Ff51kelN0fPFaRvD9+zYCav06tVmF2ve+z2Jie+TYjqO9xZ6RCheFNCFON02\n\tVp04x9oV7UpTWkNlnElH+W/lFaT67HWBTO3mFn2U=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 7 Sep 2021 01:56:29 +0300", "Message-Id": "<20210906225636.14683-23-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20210906225420.13275-1-laurent.pinchart@ideasonboard.com>", "References": "<20210906225420.13275-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 23/30] cam: drm: Support per-plane\n\tstride values", "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>" }, "content": "The stride is not always identical for all planes for multi-planar\nformats. Semi-planar YUV formats without horizontal subsampling often\nhave a chroma stride equal to twice the luma stride, and tri-planar YUV\nformats with a 1/2 horizontal subsampling often have a chroma stride\nequal to half the luma stride. This isn't correctly taken into account\nwhen creating a DRM frame buffer, as the same stride is set for all\nplanes.\n\nlibcamera doesn't report per-plane stride values yet, but uses chroma\nstrides that match the above description for all currently supported\nplatforms. Calculation the chrome strides appropriately in the KMSSink\nclass, and pass them to DRM::createFrameBuffer().\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n---\n src/cam/drm.cpp | 7 +++----\n src/cam/drm.h | 5 ++++-\n src/cam/kms_sink.cpp | 28 +++++++++++++++++++++++++++-\n 3 files changed, 34 insertions(+), 6 deletions(-)", "diff": "diff --git a/src/cam/drm.cpp b/src/cam/drm.cpp\nindex da317e27cb19..ac47b8bd3287 100644\n--- a/src/cam/drm.cpp\n+++ b/src/cam/drm.cpp\n@@ -595,12 +595,12 @@ const Object *Device::object(uint32_t id)\n std::unique_ptr<FrameBuffer> Device::createFrameBuffer(\n \tconst libcamera::FrameBuffer &buffer,\n \tconst libcamera::PixelFormat &format,\n-\tconst libcamera::Size &size, unsigned int stride)\n+\tconst libcamera::Size &size,\n+\tconst std::array<uint32_t, 4> &strides)\n {\n \tstd::unique_ptr<FrameBuffer> fb{ new FrameBuffer(this) };\n \n \tuint32_t handles[4] = {};\n-\tuint32_t pitches[4] = {};\n \tuint32_t offsets[4] = {};\n \tint ret;\n \n@@ -623,13 +623,12 @@ std::unique_ptr<FrameBuffer> Device::createFrameBuffer(\n \t\tfb->planes_.push_back({ handle });\n \n \t\thandles[i] = handle;\n-\t\tpitches[i] = stride;\n \t\toffsets[i] = 0; /* TODO */\n \t\t++i;\n \t}\n \n \tret = drmModeAddFB2(fd_, size.width, size.height, format.fourcc(), handles,\n-\t\t\t pitches, offsets, &fb->id_, 0);\n+\t\t\t strides.data(), offsets, &fb->id_, 0);\n \tif (ret < 0) {\n \t\tret = -errno;\n \t\tstd::cerr\ndiff --git a/src/cam/drm.h b/src/cam/drm.h\nindex ee2304025208..00f7e798b771 100644\n--- a/src/cam/drm.h\n+++ b/src/cam/drm.h\n@@ -7,9 +7,11 @@\n #ifndef __CAM_DRM_H__\n #define __CAM_DRM_H__\n \n+#include <array>\n #include <list>\n #include <map>\n #include <memory>\n+#include <stdint.h>\n #include <string>\n #include <vector>\n \n@@ -298,7 +300,8 @@ public:\n \tstd::unique_ptr<FrameBuffer> createFrameBuffer(\n \t\tconst libcamera::FrameBuffer &buffer,\n \t\tconst libcamera::PixelFormat &format,\n-\t\tconst libcamera::Size &size, unsigned int stride);\n+\t\tconst libcamera::Size &size,\n+\t\tconst std::array<uint32_t, 4> &strides);\n \n \tlibcamera::Signal<AtomicRequest *> requestComplete;\n \ndiff --git a/src/cam/kms_sink.cpp b/src/cam/kms_sink.cpp\nindex 8c0b79c63922..658192efc105 100644\n--- a/src/cam/kms_sink.cpp\n+++ b/src/cam/kms_sink.cpp\n@@ -7,10 +7,12 @@\n \n #include \"kms_sink.h\"\n \n+#include <array>\n #include <algorithm>\n #include <assert.h>\n #include <iostream>\n #include <memory>\n+#include <stdint.h>\n #include <string.h>\n \n #include <libcamera/camera.h>\n@@ -65,8 +67,32 @@ KMSSink::KMSSink(const std::string &connectorName)\n \n void KMSSink::mapBuffer(libcamera::FrameBuffer *buffer)\n {\n+\tstd::array<uint32_t, 4> strides = {};\n+\n+\t/* \\todo Should libcamera report per-plane strides ? */\n+\tunsigned int uvStrideMultiplier;\n+\n+\tswitch (format_) {\n+\tcase libcamera::formats::NV24:\n+\tcase libcamera::formats::NV42:\n+\t\tuvStrideMultiplier = 4;\n+\t\tbreak;\n+\tcase libcamera::formats::YUV420:\n+\tcase libcamera::formats::YVU420:\n+\tcase libcamera::formats::YUV422:\n+\t\tuvStrideMultiplier = 1;\n+\t\tbreak;\n+\tdefault:\n+\t\tuvStrideMultiplier = 2;\n+\t\tbreak;\n+\t}\n+\n+\tstrides[0] = stride_;\n+\tfor (unsigned int i = 1; i < buffer->planes().size(); ++i)\n+\t\tstrides[i] = stride_ * uvStrideMultiplier / 2;\n+\n \tstd::unique_ptr<DRM::FrameBuffer> drmBuffer =\n-\t\tdev_.createFrameBuffer(*buffer, format_, size_, stride_);\n+\t\tdev_.createFrameBuffer(*buffer, format_, size_, strides);\n \tif (!drmBuffer)\n \t\treturn;\n \n", "prefixes": [ "libcamera-devel", "v3", "23/30" ] }