From patchwork Sun Jul 24 14:43:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 16750 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 CF409BE173 for ; Sun, 24 Jul 2022 14:44:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 71D8D63316; Sun, 24 Jul 2022 16:44:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1658673850; bh=rdo0ANfoaQd4z+RmqfqVQeuBuUZ8qXw4BbeTYQTHvYw=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=ZpPl0/gBv9BtpGOroaZF9Orr5hiMjcxGafXfIfN9VnrxcOtbxqWSgfCIguiPz/8Cd TwW8H9Vo/pAwKnr4N8kDMzfWXIlS6wI21wuj1NIt6XzRk2tVpqhC5wDwK2xv9e520F lhAhmm7UUZF7zv8CF5rpVUdwHFnBhwg4FZOanBtDx35Au7kpw0cAkrR1yWvLNsPeY6 84R5KH3pCwpdRhQHrYHTOjonDphalXP2UDT+nmAp97iB3NHx5JG0ZlWUSBTjolYWLq 5zoeifJATp1Y5eioH1yaYKaXTbktI/ybppeCO9gJkCWtcTLEW17oNjhgUUCAHRlt6R YX09z0hvlzurw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0DFA063314 for ; Sun, 24 Jul 2022 16:44:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="jZgaa3Wr"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [IPv6:2401:4900:1f3e:f7a:bc8f:12ed:b45f:c35d]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 244ED835; Sun, 24 Jul 2022 16:44:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1658673847; bh=rdo0ANfoaQd4z+RmqfqVQeuBuUZ8qXw4BbeTYQTHvYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jZgaa3Wr4/0iV0ihxirXvsrpQ7CUdtydTo4RU8QoMIJ+FBU8YWgyvbeOhvY/OVt+7 LRyP54thBc36Cx6YNBESSy0G96/+tVmPIDK8OK9FglbGbgl0nIpNV0WG2k5YUPw+46 PgDp7M1FLJ/TgUHcRA0wX3HVS5yKjkaE/KBJtE8o= To: libcamera-devel@lists.libcamera.org Date: Sun, 24 Jul 2022 20:13:53 +0530 Message-Id: <20220724144355.104978-2-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220724144355.104978-1-umang.jain@ideasonboard.com> References: <20220724144355.104978-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] libcamera: camera: Fix documentation typo 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: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Cc: rishikeshdonadkar@gmail.com, nicolas.dufresne@collabora.com, vedantparanjape160201@gmail.com Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart --- src/libcamera/camera.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 2a8ef60e..3910915c 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -358,8 +358,8 @@ bool isRaw(const PixelFormat &pixFmt) * \return A CameraConfiguration::Status value that describes the validation * status. * \retval CameraConfigutation::Adjusted The configuration has been adjusted - * and is now valid. The color space of some or all of the streams may bave - * benn changed. The caller shall check the color spaces carefully. + * and is now valid. The color space of some or all of the streams may have + * been changed. The caller shall check the color spaces carefully. * \retval CameraConfiguration::Valid The configuration was already valid and * hasn't been adjusted. */ From patchwork Sun Jul 24 14:43:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 16751 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 C26B0BE173 for ; Sun, 24 Jul 2022 14:44:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8069C63318; Sun, 24 Jul 2022 16:44:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1658673852; bh=p3zcJc7vBKICC5GwNKYYxll+zLwA+KFyD6S76yoHSt8=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=GkiJG7riVQ0Xy36YQFfIm0zv7AqDxSmcx2Dm03SdyoXAF+YQYJV4vPhR1laSks5BO d1CmV81nLDkSXfHDZ3aRbGcjt0KE/Rlte1duFl/2uSIR/4Kuq/djcJhiFsN7ohpjhT vbdqy07ji5xQwxgXTfQvFVWtRHlj0a367o9s8PTBpADX/ZzhEygv7Pr3VG/5HM+DM5 636dqhcQ/iNQvjFE9QSCBAt2x9beUanYDpZjomqDvQyMeKcOORDkH0Pr7qSeQazBBb s8tlBnaeo1qy1/hUl7ah6Auk+qq9pLGLFaZpfaWX5akXyOPKsVGLE5e/MZv8FbMBVC nVI34NS+9x6ew== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 52E736330D for ; Sun, 24 Jul 2022 16:44:10 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rhdeHjhY"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [IPv6:2401:4900:1f3e:f7a:bc8f:12ed:b45f:c35d]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ACDE9835; Sun, 24 Jul 2022 16:44:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1658673850; bh=p3zcJc7vBKICC5GwNKYYxll+zLwA+KFyD6S76yoHSt8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rhdeHjhY4bAmGfqFRr7WctuBNKinaLJl3KR513YXXynbLTnfTwZNsp3K3BdZdh6bj fOt3S08iYkn/WADe2jAG6hDlI1TvcXGICRml5d0f4EmzQ1nANuG7x8BDXHaHZ9/Okj 7ARVhv2DXeTAxHltCkc2AGveQ2JjOi9c/pnfEX7E= To: libcamera-devel@lists.libcamera.org Date: Sun, 24 Jul 2022 20:13:54 +0530 Message-Id: <20220724144355.104978-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220724144355.104978-1-umang.jain@ideasonboard.com> References: <20220724144355.104978-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] libcamera: colorspace: Add a default colorspace 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: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Cc: rishikeshdonadkar@gmail.com, nicolas.dufresne@collabora.com, vedantparanjape160201@gmail.com Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a Colorspace::Default which corresponds to default V4L2 colorspace identifiers. \todo Add defaults to python colorspace bindings Signed-off-by: Umang Jain --- include/libcamera/color_space.h | 5 +++++ src/libcamera/color_space.cpp | 29 ++++++++++++++++++++++++++++- src/libcamera/v4l2_device.cpp | 5 +++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/include/libcamera/color_space.h b/include/libcamera/color_space.h index 086c56c1..0ad8da17 100644 --- a/include/libcamera/color_space.h +++ b/include/libcamera/color_space.h @@ -16,6 +16,7 @@ class ColorSpace { public: enum class Primaries { + Default, Raw, Smpte170m, Rec709, @@ -23,12 +24,14 @@ public: }; enum class TransferFunction { + Default, Linear, Srgb, Rec709, }; enum class YcbcrEncoding { + Default, None, Rec601, Rec709, @@ -36,6 +39,7 @@ public: }; enum class Range { + Default, Full, Limited, }; @@ -45,6 +49,7 @@ public: { } + static const ColorSpace Default; static const ColorSpace Raw; static const ColorSpace Jpeg; static const ColorSpace Srgb; diff --git a/src/libcamera/color_space.cpp b/src/libcamera/color_space.cpp index 895e5c8e..d52f58cf 100644 --- a/src/libcamera/color_space.cpp +++ b/src/libcamera/color_space.cpp @@ -50,6 +50,9 @@ namespace libcamera { * \enum ColorSpace::Primaries * \brief The color primaries for this color space * + * \var ColorSpace::Primaries::Default + * \brief Use the default primaries as defined by the driver + * * \var ColorSpace::Primaries::Raw * \brief These are raw colors directly from a sensor, the primaries are * unspecified @@ -68,6 +71,9 @@ namespace libcamera { * \enum ColorSpace::TransferFunction * \brief The transfer function used for this color space * + * \var ColorSpace::TransferFunction::Default + * \brief Use the default transfer function as defined by the driver + * * \var ColorSpace::TransferFunction::Linear * \brief This color space uses a linear (identity) transfer function * @@ -82,6 +88,9 @@ namespace libcamera { * \enum ColorSpace::YcbcrEncoding * \brief The Y'CbCr encoding * + * \var ColorSpace::YcbcrEncoding::Default + * \brief Use the default Y'CbCr encoding as defined by the driver + * * \var ColorSpace::YcbcrEncoding::None * \brief There is no defined Y'CbCr encoding (used for non-YUV formats) * @@ -99,6 +108,9 @@ namespace libcamera { * \enum ColorSpace::Range * \brief The range (sometimes "quantisation") for this color space * + * \var ColorSpace::Range::Default + * Use the default range as defined by the driver + * * \var ColorSpace::Range::Full * \brief This color space uses full range pixel values * @@ -132,7 +144,8 @@ std::string ColorSpace::toString() const { /* Print out a brief name only for standard color spaces. */ - static const std::array, 6> colorSpaceNames = { { + static const std::array, 7> colorSpaceNames = { { + { ColorSpace::Default, "Default" }, { ColorSpace::Raw, "RAW" }, { ColorSpace::Jpeg, "JPEG" }, { ColorSpace::Srgb, "sRGB" }, @@ -150,23 +163,27 @@ std::string ColorSpace::toString() const /* Assemble a name made of the constituent fields. */ static const std::map primariesNames = { + { Primaries::Default, "Default" }, { Primaries::Raw, "RAW" }, { Primaries::Smpte170m, "SMPTE170M" }, { Primaries::Rec709, "Rec709" }, { Primaries::Rec2020, "Rec2020" }, }; static const std::map transferNames = { + { TransferFunction::Default, "Default" }, { TransferFunction::Linear, "Linear" }, { TransferFunction::Srgb, "sRGB" }, { TransferFunction::Rec709, "Rec709" }, }; static const std::map encodingNames = { + { YcbcrEncoding::Default, "Default" }, { YcbcrEncoding::None, "None" }, { YcbcrEncoding::Rec601, "Rec601" }, { YcbcrEncoding::Rec709, "Rec709" }, { YcbcrEncoding::Rec2020, "Rec2020" }, }; static const std::map rangeNames = { + { Range::Default, "Default" }, { Range::Full, "Full" }, { Range::Limited, "Limited" }, }; @@ -232,6 +249,16 @@ std::string ColorSpace::toString(const std::optional &colorSpace) * \brief The pixel range used with by color space */ +/** + * \brief A constant representing a default color space + */ +const ColorSpace ColorSpace::Default = { + Primaries::Default, + TransferFunction::Default, + YcbcrEncoding::Default, + Range::Default +}; + /** * \brief A constant representing a raw color space (from a sensor) */ diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 3fc8438f..ecfcf337 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -770,6 +770,7 @@ static const std::map v4l2ToRange = { }; static const std::vector> colorSpaceToV4l2 = { + { ColorSpace::Default, V4L2_COLORSPACE_DEFAULT }, { ColorSpace::Raw, V4L2_COLORSPACE_RAW }, { ColorSpace::Jpeg, V4L2_COLORSPACE_JPEG }, { ColorSpace::Srgb, V4L2_COLORSPACE_SRGB }, @@ -779,6 +780,7 @@ static const std::vector> colorSpaceToV4l }; static const std::map primariesToV4l2 = { + { ColorSpace::Primaries::Default, V4L2_COLORSPACE_DEFAULT }, { ColorSpace::Primaries::Raw, V4L2_COLORSPACE_RAW }, { ColorSpace::Primaries::Smpte170m, V4L2_COLORSPACE_SMPTE170M }, { ColorSpace::Primaries::Rec709, V4L2_COLORSPACE_REC709 }, @@ -786,18 +788,21 @@ static const std::map primariesToV4l2 = }; static const std::map transferFunctionToV4l2 = { + { ColorSpace::TransferFunction::Default, V4L2_XFER_FUNC_DEFAULT }, { ColorSpace::TransferFunction::Linear, V4L2_XFER_FUNC_NONE }, { ColorSpace::TransferFunction::Srgb, V4L2_XFER_FUNC_SRGB }, { ColorSpace::TransferFunction::Rec709, V4L2_XFER_FUNC_709 }, }; static const std::map ycbcrEncodingToV4l2 = { + { ColorSpace::YcbcrEncoding::Default, V4L2_YCBCR_ENC_DEFAULT }, { ColorSpace::YcbcrEncoding::Rec601, V4L2_YCBCR_ENC_601 }, { ColorSpace::YcbcrEncoding::Rec709, V4L2_YCBCR_ENC_709 }, { ColorSpace::YcbcrEncoding::Rec2020, V4L2_YCBCR_ENC_BT2020 }, }; static const std::map rangeToV4l2 = { + { ColorSpace::Range::Default, V4L2_QUANTIZATION_DEFAULT }, { ColorSpace::Range::Full, V4L2_QUANTIZATION_FULL_RANGE }, { ColorSpace::Range::Limited, V4L2_QUANTIZATION_LIM_RANGE }, }; From patchwork Sun Jul 24 14:43:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 16752 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 45F86BE173 for ; Sun, 24 Jul 2022 14:44:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0FC256331B; Sun, 24 Jul 2022 16:44:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1658673854; bh=VGciOW5U+ee0LXxK1e5CjUkTEynElKoMA8UgLCPr2SE=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=pV7jrjCFm7mC3MlfrZzcwPGoFpj5hUKNjY5+lukWlUcz6wv4+KcZtwEF3jXQCMo6m uI1Wr5zhxDvtjP/bhcqtTrlvhLpCTdWo0dC2iUlbAjvdqyLLY5206jldefl1Ow1xjT PvyXX56JWz7S2vToIQoxhHYJaL3WQVGnaEwtTlDxPO6PYCV7HZdD2xxZbTHjqJjaUJ LIlsybP2MzJwoszN+JIEbG14LcMRZyn0uwdfu2PSlioXRHfsQga6DP6Ji4Pq0+Str8 Ya10GiLiJKxSQs7YYWmVXzcBS0zsdhJxbH4yUm/zueoqdL5Hzer2nHGWiueuHN69rq nn+QdfWMq9jtw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DC6EB63315 for ; Sun, 24 Jul 2022 16:44:12 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="amz9E56N"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [IPv6:2401:4900:1f3e:f7a:bc8f:12ed:b45f:c35d]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4182C898; Sun, 24 Jul 2022 16:44:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1658673852; bh=VGciOW5U+ee0LXxK1e5CjUkTEynElKoMA8UgLCPr2SE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=amz9E56NxTkpkJ6dIjQebebYm+KU6klu3l+K48ddHxf2uP5n6SpxGjVyNgfW5hvP9 PyExr2aBs4Qi2zmQKO6IuJrGBbNHfL7BOCsaAdbS725vlGyqlWV+dLEXdc8yqkmt32 j8VVy+6WFaDr4mvRN/YTzqXDWF6aZKjQExCwzYvg= To: libcamera-devel@lists.libcamera.org Date: Sun, 24 Jul 2022 20:13:55 +0530 Message-Id: <20220724144355.104978-4-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220724144355.104978-1-umang.jain@ideasonboard.com> References: <20220724144355.104978-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] gstreamer: Provide colorimetry <> libcamera::ColorSpace mappings 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: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Cc: rishikeshdonadkar@gmail.com, nicolas.dufresne@collabora.com, vedantparanjape160201@gmail.com Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Rishikesh Donadkar Provide colorimetry <=> libcamera::ColorSpace mappings via: - GstVideoColorimetry colorimetry_from_colorspace(colorspace); - ColorSpace colorspace_from_colorimetry(colorimetry); Read the colorimetry field from caps into the stream configuration. After stream validation, the sensor supported colorimetry will be retrieved and the caps will be updated accordingly. Colorimetry support for gstlibcamerasrc currently undertakes only one argument. Multiple colorimetry support shall be introduced in subsequent commits. Signed-off-by: Rishikesh Donadkar Signed-off-by: Umang Jain --- src/gstreamer/gstlibcamera-utils.cpp | 175 +++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp index c97c0d43..fb4f0e5c 100644 --- a/src/gstreamer/gstlibcamera-utils.cpp +++ b/src/gstreamer/gstlibcamera-utils.cpp @@ -45,6 +45,157 @@ static struct { /* \todo NV42 is used in libcamera but is not mapped in GStreamer yet. */ }; +static GstVideoColorimetry +colorimetry_from_colorspace(const ColorSpace &colorSpace) +{ + GstVideoColorimetry colorimetry; + + switch (colorSpace.primaries) { + case ColorSpace::Primaries::Rec709: + colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT709; + break; + case ColorSpace::Primaries::Rec2020: + colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT2020; + break; + case ColorSpace::Primaries::Smpte170m: + colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_SMPTE170M; + break; + default: + GST_WARNING("ColorSpace primaries not mapped in GstLibcameraSrc"); + colorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_UNKNOWN; + } + + switch (colorSpace.transferFunction) { + case ColorSpace::TransferFunction::Rec709: + colorimetry.transfer = GST_VIDEO_TRANSFER_BT709; + break; + case ColorSpace::TransferFunction::Srgb: + colorimetry.transfer = GST_VIDEO_TRANSFER_SRGB; + break; + case ColorSpace::TransferFunction::Linear: + colorimetry.transfer = GST_VIDEO_TRANSFER_GAMMA10; + break; + default: + GST_WARNING("ColorSpace transfer function not mapped in GstLibcameraSrc"); + colorimetry.transfer = GST_VIDEO_TRANSFER_UNKNOWN; + } + + switch (colorSpace.ycbcrEncoding) { + case ColorSpace::YcbcrEncoding::Rec709: + colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709; + break; + case ColorSpace::YcbcrEncoding::Rec2020: + colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT2020; + break; + case ColorSpace::YcbcrEncoding::Rec601: + colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601; + break; + default: + GST_WARNING("Colorspace YcbcrEncoding not mapped in GstLibcameraSrc"); + colorimetry.matrix = GST_VIDEO_COLOR_MATRIX_UNKNOWN; + } + + switch (colorSpace.range) { + case ColorSpace::Range::Full: + colorimetry.range = GST_VIDEO_COLOR_RANGE_0_255; + break; + case ColorSpace::Range::Limited: + colorimetry.range = GST_VIDEO_COLOR_RANGE_16_235; + break; + default: + GST_WARNING("Colorspace range not mapped in GstLibcameraSrc"); + colorimetry.range = GST_VIDEO_COLOR_RANGE_UNKNOWN; + } + + return colorimetry; +} + +static std::optional +colorspace_from_colorimetry(GstVideoColorimetry *colorimetry) +{ + std::optional colorspace = ColorSpace::Default; + + switch (colorimetry->primaries) { + case GST_VIDEO_COLOR_PRIMARIES_BT709: + colorspace->primaries = ColorSpace::Primaries::Rec709; + break; + case GST_VIDEO_COLOR_PRIMARIES_BT2020: + colorspace->primaries = ColorSpace::Primaries::Rec2020; + break; + case GST_VIDEO_COLOR_PRIMARIES_SMPTE170M: + colorspace->primaries = ColorSpace::Primaries::Smpte170m; + break; + case GST_VIDEO_COLOR_PRIMARIES_UNKNOWN: + colorspace->primaries = ColorSpace::Primaries::Default; + break; + default: + GST_WARNING("Unknown primaries in colorimetry %d", colorimetry->primaries); + } + + switch (colorimetry->transfer) { + /* Tranfer function mappings inspired from v4l2src plugin */ + case GST_VIDEO_TRANSFER_GAMMA18: + case GST_VIDEO_TRANSFER_GAMMA20: + case GST_VIDEO_TRANSFER_GAMMA22: + case GST_VIDEO_TRANSFER_GAMMA28: + GST_WARNING("GAMMA 18, 20, 22, 28 transfer functions not supported"); + /* fallthrough */ + case GST_VIDEO_TRANSFER_GAMMA10: + colorspace->transferFunction = ColorSpace::TransferFunction::Linear; + break; + case GST_VIDEO_TRANSFER_BT601: + case GST_VIDEO_TRANSFER_BT2020_12: + case GST_VIDEO_TRANSFER_BT2020_10: + case GST_VIDEO_TRANSFER_BT709: + colorspace->transferFunction = ColorSpace::TransferFunction::Rec709; + break; + case GST_VIDEO_TRANSFER_SRGB: + colorspace->transferFunction = ColorSpace::TransferFunction::Srgb; + break; + case GST_VIDEO_TRANSFER_UNKNOWN: + colorspace->transferFunction = ColorSpace::TransferFunction::Default; + break; + default: + GST_WARNING("Unknown colorimetry transfer %d", colorimetry->transfer); + } + + switch (colorimetry->matrix) { + /* FCC is about the same as BT601 with less digit */ + case GST_VIDEO_COLOR_MATRIX_FCC: + case GST_VIDEO_COLOR_MATRIX_BT601: + colorspace->ycbcrEncoding = ColorSpace::YcbcrEncoding::Rec601; + break; + case GST_VIDEO_COLOR_MATRIX_BT709: + colorspace->ycbcrEncoding = ColorSpace::YcbcrEncoding::Rec709; + break; + case GST_VIDEO_COLOR_MATRIX_BT2020: + colorspace->ycbcrEncoding = ColorSpace::YcbcrEncoding::Rec2020; + break; + case GST_VIDEO_COLOR_MATRIX_RGB: + case GST_VIDEO_COLOR_MATRIX_UNKNOWN: + colorspace->ycbcrEncoding = ColorSpace::YcbcrEncoding::Default; + break; + default: + GST_WARNING("Unknown colorimetry matrix %d", colorimetry->matrix); + } + + switch (colorimetry->range) { + case GST_VIDEO_COLOR_RANGE_0_255: + colorspace->range = ColorSpace::Range::Full; + break; + case GST_VIDEO_COLOR_RANGE_16_235: + colorspace->range = ColorSpace::Range::Limited; + break; + case GST_VIDEO_COLOR_RANGE_UNKNOWN: + colorspace->range = ColorSpace::Range::Default; + break; + default: + GST_WARNING("Unknown range in colorimetry %d", colorimetry->range); + } + + return colorspace; +} + static GstVideoFormat pixel_format_to_gst_format(const PixelFormat &format) { @@ -139,6 +290,17 @@ gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg "width", G_TYPE_INT, stream_cfg.size.width, "height", G_TYPE_INT, stream_cfg.size.height, nullptr); + + if (stream_cfg.colorSpace) { + GstVideoColorimetry colorimetry = colorimetry_from_colorspace(stream_cfg.colorSpace.value()); + gchar *colorimetry_str = gst_video_colorimetry_to_string(&colorimetry); + + if (colorimetry_str != nullptr) + gst_structure_set(s, "colorimetry", G_TYPE_STRING, colorimetry_str, nullptr); + else + g_warning("libcamera::ColorSpace found but GstVideoColorimetry unknown"); + } + gst_caps_append_structure(caps, s); return caps; @@ -222,6 +384,19 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg, gst_structure_get_int(s, "height", &height); stream_cfg.size.width = width; stream_cfg.size.height = height; + + /* Configure colorimetry */ + if (gst_structure_has_field(s, "colorimetry")) { + const gchar *colorimetry_caps = gst_structure_get_string(s, "colorimetry"); + GstVideoColorimetry colorimetry; + + if(gst_video_colorimetry_from_string(&colorimetry, colorimetry_caps)) { + std::optional colorSpace = colorspace_from_colorimetry(&colorimetry); + stream_cfg.colorSpace = colorSpace; + } else { + g_print("Invalid colorimetry %s", colorimetry_caps); + } + } } #if !GST_CHECK_VERSION(1, 17, 1)