From patchwork Wed Sep 28 01:49:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17447 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 47B4FBD16B for ; Wed, 28 Sep 2022 01:49:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5F48E62278; Wed, 28 Sep 2022 03:49:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664329778; bh=mQGZtabn2tRbheOU7LLOM1znxcQjbg91BhwshYHz7j8=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=QzUTazINB9DOkp9YV1FsJnPGqhNWeGwmGHOmNh6Ix1yZJOEetuXiNk3z5fwRQMp7X mENvBxHAOKPc1tTalaCg9DjpIbi6IfJPBk17veNOgkMCckjEN58rK6A4ecQJb7I1TF srEh3Vc3qWQ7s3EqFei9TpNYJhKxwjlIu2gq3yxgv/OX0hjBfDANJmsNmMjIcD8rg+ upQE/3PoTts5aMqkjCEbgahJr3x3KRFsPBYJqzfjbjJwtRkDEh5t5QUuTmq9NI5h0P sFUBeGEA99KSo7BhydLVFjyG9aF1BN1vG9zuloTUL0qOlOkfF/DZgCsZC2E47q3oXV EJKsdVJ4LRsnQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BB44A61F78 for ; Wed, 28 Sep 2022 03:49:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="tZxInMnP"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2366D47C for ; Wed, 28 Sep 2022 03:49:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1664329776; bh=mQGZtabn2tRbheOU7LLOM1znxcQjbg91BhwshYHz7j8=; h=From:To:Subject:Date:From; b=tZxInMnPMVV46jvU7WycEo8QAizYS3n48cwHcKWHRoGcchehcGyViFBiSWo6W4Z78 qXYbbSqF3P1DtQhaFkBJg3+wVFVUgHJlSB4bKtsXZlXzbGL38ZZEmvKE5RW3oPefdr 3/kyBKKmwSLQIbPr6jX3fl0Ni+bI1h3nRbXo9m3A= 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 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" KMS defines YCbCr encoding and quantization properties for planes. When supported by the device, set them to match the color space of the stream to render colors accurately. Signed-off-by: Laurent Pinchart Reviewed-by: Eric Curtin --- src/cam/kms_sink.cpp | 80 ++++++++++++++++++++++++++++++++++++++++++++ src/cam/kms_sink.h | 3 ++ 2 files changed, 83 insertions(+) diff --git a/src/cam/kms_sink.cpp b/src/cam/kms_sink.cpp index 17e2fa69bff7..754b061eebf7 100644 --- a/src/cam/kms_sink.cpp +++ b/src/cam/kms_sink.cpp @@ -149,6 +149,81 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config) size_ = cfg.size; stride_ = cfg.stride; + /* Configure color space. */ + colorEncoding_ = std::nullopt; + colorRange_ = std::nullopt; + + if (cfg.colorSpace->ycbcrEncoding == libcamera::ColorSpace::YcbcrEncoding::None) + return 0; + + /* + * The encoding and range enums are defined in the kernel but not + * exposed in public headers. + */ + enum drm_color_encoding { + DRM_COLOR_YCBCR_BT601, + DRM_COLOR_YCBCR_BT709, + DRM_COLOR_YCBCR_BT2020, + }; + + enum drm_color_range { + DRM_COLOR_YCBCR_LIMITED_RANGE, + DRM_COLOR_YCBCR_FULL_RANGE, + }; + + const DRM::Property *colorEncoding = plane_->property("COLOR_ENCODING"); + const DRM::Property *colorRange = plane_->property("COLOR_RANGE"); + + if (colorEncoding) { + drm_color_encoding encoding; + + switch (cfg.colorSpace->ycbcrEncoding) { + case libcamera::ColorSpace::YcbcrEncoding::Rec601: + default: + encoding = DRM_COLOR_YCBCR_BT601; + break; + case libcamera::ColorSpace::YcbcrEncoding::Rec709: + encoding = DRM_COLOR_YCBCR_BT709; + break; + case libcamera::ColorSpace::YcbcrEncoding::Rec2020: + encoding = DRM_COLOR_YCBCR_BT2020; + break; + } + + for (const auto &[id, name] : colorEncoding->enums()) { + if (id == encoding) { + colorEncoding_ = encoding; + break; + } + } + } + + if (colorRange) { + drm_color_range range; + + switch (cfg.colorSpace->range) { + case libcamera::ColorSpace::Range::Limited: + default: + range = DRM_COLOR_YCBCR_LIMITED_RANGE; + break; + case libcamera::ColorSpace::Range::Full: + range = DRM_COLOR_YCBCR_FULL_RANGE; + break; + } + + for (const auto &[id, name] : colorRange->enums()) { + if (id == range) { + colorRange_ = range; + break; + } + } + } + + if (!colorEncoding_ || !colorRange_) + std::cerr << "Color space " << cfg.colorSpace->toString() + << " not supported by the display device." + << " Colors may be wrong." << std::endl; + return 0; } @@ -415,6 +490,11 @@ bool KMSSink::processRequest(libcamera::Request *camRequest) drmRequest->addProperty(plane_, "CRTC_W", dst_.width); drmRequest->addProperty(plane_, "CRTC_H", dst_.height); + if (colorEncoding_) + drmRequest->addProperty(plane_, "COLOR_ENCODING", *colorEncoding_); + if (colorRange_) + drmRequest->addProperty(plane_, "COLOR_RANGE", *colorRange_); + flags |= DRM::AtomicRequest::FlagAllowModeset; } diff --git a/src/cam/kms_sink.h b/src/cam/kms_sink.h index 76c4e611bf85..e2c618a19035 100644 --- a/src/cam/kms_sink.h +++ b/src/cam/kms_sink.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -67,6 +68,8 @@ private: libcamera::PixelFormat format_; libcamera::Size size_; unsigned int stride_; + std::optional colorEncoding_; + std::optional colorRange_; libcamera::Rectangle src_; libcamera::Rectangle dst_;