Patch Detail
Show a patch.
GET /api/1.1/patches/17447/?format=api
{ "id": 17447, "url": "https://patchwork.libcamera.org/api/1.1/patches/17447/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17447/", "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": "<20220928014934.22922-1-laurent.pinchart@ideasonboard.com>", "date": "2022-09-28T01:49:34", "name": "[libcamera-devel] cam: kms_sink: Add color space support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ee9bc2267145099ba4840cd317a6b3237ffa1e5b", "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/17447/mbox/", "series": [ { "id": 3509, "url": "https://patchwork.libcamera.org/api/1.1/series/3509/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3509", "date": "2022-09-28T01:49:34", "name": "[libcamera-devel] cam: kms_sink: Add color space support", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3509/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17447/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17447/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 47B4FBD16B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 28 Sep 2022 01:49:39 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5F48E62278;\n\tWed, 28 Sep 2022 03:49:38 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BB44A61F78\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 28 Sep 2022 03:49:36 +0200 (CEST)", "from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2366D47C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 28 Sep 2022 03:49:36 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1664329778;\n\tbh=mQGZtabn2tRbheOU7LLOM1znxcQjbg91BhwshYHz7j8=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=QzUTazINB9DOkp9YV1FsJnPGqhNWeGwmGHOmNh6Ix1yZJOEetuXiNk3z5fwRQMp7X\n\tmENvBxHAOKPc1tTalaCg9DjpIbi6IfJPBk17veNOgkMCckjEN58rK6A4ecQJb7I1TF\n\tsrEh3Vc3qWQ7s3EqFei9TpNYJhKxwjlIu2gq3yxgv/OX0hjBfDANJmsNmMjIcD8rg+\n\tupQE/3PoTts5aMqkjCEbgahJr3x3KRFsPBYJqzfjbjJwtRkDEh5t5QUuTmq9NI5h0P\n\tsFUBeGEA99KSo7BhydLVFjyG9aF1BN1vG9zuloTUL0qOlOkfF/DZgCsZC2E47q3oXV\n\tEJKsdVJ4LRsnQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1664329776;\n\tbh=mQGZtabn2tRbheOU7LLOM1znxcQjbg91BhwshYHz7j8=;\n\th=From:To:Subject:Date:From;\n\tb=tZxInMnPMVV46jvU7WycEo8QAizYS3n48cwHcKWHRoGcchehcGyViFBiSWo6W4Z78\n\tqXYbbSqF3P1DtQhaFkBJg3+wVFVUgHJlSB4bKtsXZlXzbGL38ZZEmvKE5RW3oPefdr\n\t3/kyBKKmwSLQIbPr6jX3fl0Ni+bI1h3nRbXo9m3A=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"tZxInMnP\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 28 Sep 2022 04:49:34 +0300", "Message-Id": "<20220928014934.22922-1-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] cam: kms_sink: Add color space support", "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>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "KMS defines YCbCr encoding and quantization properties for planes. When\nsupported by the device, set them to match the color space of the\nstream to render colors accurately.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/kms_sink.cpp | 80 ++++++++++++++++++++++++++++++++++++++++++++\n src/cam/kms_sink.h | 3 ++\n 2 files changed, 83 insertions(+)", "diff": "diff --git a/src/cam/kms_sink.cpp b/src/cam/kms_sink.cpp\nindex 17e2fa69bff7..754b061eebf7 100644\n--- a/src/cam/kms_sink.cpp\n+++ b/src/cam/kms_sink.cpp\n@@ -149,6 +149,81 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config)\n \tsize_ = cfg.size;\n \tstride_ = cfg.stride;\n \n+\t/* Configure color space. */\n+\tcolorEncoding_ = std::nullopt;\n+\tcolorRange_ = std::nullopt;\n+\n+\tif (cfg.colorSpace->ycbcrEncoding == libcamera::ColorSpace::YcbcrEncoding::None)\n+\t\treturn 0;\n+\n+\t/*\n+\t * The encoding and range enums are defined in the kernel but not\n+\t * exposed in public headers.\n+\t */\n+\tenum drm_color_encoding {\n+\t\tDRM_COLOR_YCBCR_BT601,\n+\t\tDRM_COLOR_YCBCR_BT709,\n+\t\tDRM_COLOR_YCBCR_BT2020,\n+\t};\n+\n+\tenum drm_color_range {\n+\t\tDRM_COLOR_YCBCR_LIMITED_RANGE,\n+\t\tDRM_COLOR_YCBCR_FULL_RANGE,\n+\t};\n+\n+\tconst DRM::Property *colorEncoding = plane_->property(\"COLOR_ENCODING\");\n+\tconst DRM::Property *colorRange = plane_->property(\"COLOR_RANGE\");\n+\n+\tif (colorEncoding) {\n+\t\tdrm_color_encoding encoding;\n+\n+\t\tswitch (cfg.colorSpace->ycbcrEncoding) {\n+\t\tcase libcamera::ColorSpace::YcbcrEncoding::Rec601:\n+\t\tdefault:\n+\t\t\tencoding = DRM_COLOR_YCBCR_BT601;\n+\t\t\tbreak;\n+\t\tcase libcamera::ColorSpace::YcbcrEncoding::Rec709:\n+\t\t\tencoding = DRM_COLOR_YCBCR_BT709;\n+\t\t\tbreak;\n+\t\tcase libcamera::ColorSpace::YcbcrEncoding::Rec2020:\n+\t\t\tencoding = DRM_COLOR_YCBCR_BT2020;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tfor (const auto &[id, name] : colorEncoding->enums()) {\n+\t\t\tif (id == encoding) {\n+\t\t\t\tcolorEncoding_ = encoding;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tif (colorRange) {\n+\t\tdrm_color_range range;\n+\n+\t\tswitch (cfg.colorSpace->range) {\n+\t\tcase libcamera::ColorSpace::Range::Limited:\n+\t\tdefault:\n+\t\t\trange = DRM_COLOR_YCBCR_LIMITED_RANGE;\n+\t\t\tbreak;\n+\t\tcase libcamera::ColorSpace::Range::Full:\n+\t\t\trange = DRM_COLOR_YCBCR_FULL_RANGE;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tfor (const auto &[id, name] : colorRange->enums()) {\n+\t\t\tif (id == range) {\n+\t\t\t\tcolorRange_ = range;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tif (!colorEncoding_ || !colorRange_)\n+\t\tstd::cerr << \"Color space \" << cfg.colorSpace->toString()\n+\t\t\t << \" not supported by the display device.\"\n+\t\t\t << \" Colors may be wrong.\" << std::endl;\n+\n \treturn 0;\n }\n \n@@ -415,6 +490,11 @@ bool KMSSink::processRequest(libcamera::Request *camRequest)\n \t\tdrmRequest->addProperty(plane_, \"CRTC_W\", dst_.width);\n \t\tdrmRequest->addProperty(plane_, \"CRTC_H\", dst_.height);\n \n+\t\tif (colorEncoding_)\n+\t\t\tdrmRequest->addProperty(plane_, \"COLOR_ENCODING\", *colorEncoding_);\n+\t\tif (colorRange_)\n+\t\t\tdrmRequest->addProperty(plane_, \"COLOR_RANGE\", *colorRange_);\n+\n \t\tflags |= DRM::AtomicRequest::FlagAllowModeset;\n \t}\n \ndiff --git a/src/cam/kms_sink.h b/src/cam/kms_sink.h\nindex 76c4e611bf85..e2c618a19035 100644\n--- a/src/cam/kms_sink.h\n+++ b/src/cam/kms_sink.h\n@@ -10,6 +10,7 @@\n #include <list>\n #include <memory>\n #include <mutex>\n+#include <optional>\n #include <string>\n #include <utility>\n \n@@ -67,6 +68,8 @@ private:\n \tlibcamera::PixelFormat format_;\n \tlibcamera::Size size_;\n \tunsigned int stride_;\n+\tstd::optional<unsigned int> colorEncoding_;\n+\tstd::optional<unsigned int> colorRange_;\n \n \tlibcamera::Rectangle src_;\n \tlibcamera::Rectangle dst_;\n", "prefixes": [ "libcamera-devel" ] }