Patch Detail
Show a patch.
GET /api/patches/17010/?format=api
{ "id": 17010, "url": "https://patchwork.libcamera.org/api/patches/17010/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17010/", "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": "<20220807121233.18353-2-rishikeshdonadkar@gmail.com>", "date": "2022-08-07T12:12:32", "name": "[libcamera-devel,v1,1/2] gstreamer: Provide colorimetry <> ColorSpace mappings", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "904d4b379bd23b2e0875f8694ca95dee1771b1c3", "submitter": { "id": 118, "url": "https://patchwork.libcamera.org/api/people/118/?format=api", "name": "Rishikesh Donadkar", "email": "rishikeshdonadkar@gmail.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17010/mbox/", "series": [ { "id": 3382, "url": "https://patchwork.libcamera.org/api/series/3382/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3382", "date": "2022-08-07T12:12:31", "name": "Multiple colorimetry support for libcamerasrc.", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3382/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17010/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17010/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 3FC8CBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 7 Aug 2022 12:13:27 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ECB8963327;\n\tSun, 7 Aug 2022 14:13:26 +0200 (CEST)", "from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com\n\t[IPv6:2607:f8b0:4864:20::52b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F326563312\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 7 Aug 2022 14:13:24 +0200 (CEST)", "by mail-pg1-x52b.google.com with SMTP id h132so6336890pgc.10\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 07 Aug 2022 05:13:24 -0700 (PDT)", "from localhost.localdomain ([49.36.99.220])\n\tby smtp.googlemail.com with ESMTPSA id\n\t78-20020a621651000000b0052d3ea78858sm6454883pfw.127.2022.08.07.05.13.20\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 07 Aug 2022 05:13:22 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659874407;\n\tbh=8KYzX6QxwfYTuO0ieg++86p0IEwEKpBJkLfVLit2Dzc=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=B69aYO1cwFqZxT5bVIyjkUcfiNhmwNq+eeYL/tRCFLsC1Cv/KadewXyM+wh5lY0pw\n\tm8TfSdj6KhXNShnOEUQqcdsKQV1nJEl53KE6vCO7i9i5L2RFI4NOquJd6oIvISTe0B\n\t4P3kFwCPxl51wMkVyLLqguqL5rn1RYZ6r8bOZO+KIkgRx9vQtpwmBzEp+BZNyOlq1X\n\tBNIFJo296M5Sqn1Aj/5bKYo4/bLp2Y/IVAu4Bp55kuHBPFRG6htnL+SWkWQncVq0p6\n\tnr9YHDsks3zgtwnv+NPQdS9I9w5vjOaQQyIsvuhiiVMkV6WLcQwenzVLN0HjoWIvBk\n\tgx+E5Z/cSQ5Iw==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc;\n\tbh=nvcFRwPjfWmJiveV5a4IqUkgMI2rShUxAoRhReijduk=;\n\tb=eXYDk24x3GZI0Hi21jN10Z1RSb00Y2sYShnd2mAsqu4MQYCzzUgi3SAIiIUEfbBZZ6\n\twDZuM6QFqQvOYj1zGGfIcxZwa+5BWsftzHhEcSqjhmdFHQMxGUJof34Y9rr9ilhvdgje\n\tQxPzsI22L+q21GpSdSUpm3Fl/VRKf1qhMwK9B3MQfJmOWxY/4gbnzieur+brZ2NzyeQd\n\tEQu+C0edd9lUw0KZaqcUMPuen06yoPT+Yu0ZDrpHgF4miiZQ+VumHeNJZpdi0DyjFD3V\n\twWZJ2N5lBYL5mtp+ms5dPNw1zCevLifL1LfNMps1Q00SMXBw2dECqIczVZcfsLfQ0gtL\n\tbBvg==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"eXYDk24x\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc;\n\tbh=nvcFRwPjfWmJiveV5a4IqUkgMI2rShUxAoRhReijduk=;\n\tb=Us2fFOjFpfCOK62L67F34KJIOdTHu5NWko/xfZeamIHgedOFp2jDUj11zY+f0HNzrv\n\t0rsS8Sp6uG+kJmM8nN32GEi1M4QCS2eTaJzZbA8f19zX3cjb7qatlx9Zbxh73IavzcQq\n\tzO+5bxGh+FJ93wYOu0MlAhYwx7Cg6miLQjeKZA+ZuUHu9lkochbraYAbc7iBiCW7h6mX\n\tUjL5CE/HAUwXhlWjbfhF7hJrQr2+sbgkBwD9B1ZpRY9kEJ6kTTrARZvuCgvxg7uXLEVG\n\tWRyE07PUHeYQzHgWWasylex8KY7CJB0997uIAUVC6X+V0/pDSF0ktltXkPptgK/6iAlb\n\tCndg==", "X-Gm-Message-State": "ACgBeo3ybvVWbX+B75ve5LSh3wOkJx07SklDaTgfGnhZ9A6nl1W2nRbg\n\tNwjJBcWIl0JUIM4quJUnfaE+CPf6tvbtr27v", "X-Google-Smtp-Source": "AA6agR4uBiaeFZSkO0YIyztTWUxCZ6H0JUG8BlkkUXaHRFkwo0t0tibxtWbKS8rUQcTGIs/Muc/jFg==", "X-Received": "by 2002:a63:5626:0:b0:41b:576d:6f33 with SMTP id\n\tk38-20020a635626000000b0041b576d6f33mr12346097pgb.131.1659874403004; \n\tSun, 07 Aug 2022 05:13:23 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 7 Aug 2022 17:42:32 +0530", "Message-Id": "<20220807121233.18353-2-rishikeshdonadkar@gmail.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220807121233.18353-1-rishikeshdonadkar@gmail.com>", "References": "<20220807121233.18353-1-rishikeshdonadkar@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v1 1/2] gstreamer: Provide colorimetry <>\n\tColorSpace mappings", "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": "Rishikesh Donadkar via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Rishikesh Donadkar <rishikeshdonadkar@gmail.com>", "Cc": "Rishikesh Donadkar <rishikeshdonadkar@gmail.com>,\n\tvedantparanjape160201@gmail.com", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Provide colorimetry <=> libcamera::ColorSpace mappings via:\n- GstVideoColorimetry colorimetry_from_colorspace(colorspace);\n- ColorSpace colorspace_from_colorimetry(colorimetry);\n\nRead the colorimetry field from caps into the stream configuration.\nAfter stream validation, the sensor supported colorimetry will\nbe retrieved and the caps will be updated accordingly.\n---\n src/gstreamer/gstlibcamera-utils.cpp | 158 +++++++++++++++++++++++++++\n 1 file changed, 158 insertions(+)", "diff": "diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\nindex c97c0d43..24d8d035 100644\n--- a/src/gstreamer/gstlibcamera-utils.cpp\n+++ b/src/gstreamer/gstlibcamera-utils.cpp\n@@ -45,6 +45,152 @@ static struct {\n \t/* \\todo NV42 is used in libcamera but is not mapped in GStreamer yet. */\n };\n \n+static GstVideoColorimetry\n+colorimetry_from_colorspace(const ColorSpace &colorSpace)\n+{\n+\tGstVideoColorimetry colorimetry;\n+\n+\tswitch (colorSpace.primaries) {\n+\tcase ColorSpace::Primaries::Raw:\n+\t\tcolorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_UNKNOWN;\n+\t\tbreak;\n+\tcase ColorSpace::Primaries::Smpte170m:\n+\t\tcolorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_SMPTE170M;\n+\t\tbreak;\n+\tcase ColorSpace::Primaries::Rec709:\n+\t\tcolorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT709;\n+\t\tbreak;\n+\tcase ColorSpace::Primaries::Rec2020:\n+\t\tcolorimetry.primaries = GST_VIDEO_COLOR_PRIMARIES_BT2020;\n+\t\tbreak;\n+\t}\n+\n+\tswitch (colorSpace.transferFunction) {\n+\tcase ColorSpace::TransferFunction::Linear:\n+\t\tcolorimetry.transfer = GST_VIDEO_TRANSFER_GAMMA10;\n+\t\tbreak;\n+\tcase ColorSpace::TransferFunction::Srgb:\n+\t\tcolorimetry.transfer = GST_VIDEO_TRANSFER_SRGB;\n+\t\tbreak;\n+\tcase ColorSpace::TransferFunction::Rec709:\n+\t\tcolorimetry.transfer = GST_VIDEO_TRANSFER_BT709;\n+\t\tbreak;\n+\t}\n+\n+\tswitch (colorSpace.ycbcrEncoding) {\n+\tcase ColorSpace::YcbcrEncoding::None:\n+\t\tcolorimetry.matrix = GST_VIDEO_COLOR_MATRIX_RGB;\n+\t\tbreak;\n+\tcase ColorSpace::YcbcrEncoding::Rec601:\n+\t\tcolorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT601;\n+\t\tbreak;\n+\tcase ColorSpace::YcbcrEncoding::Rec709:\n+\t\tcolorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT709;\n+\t\tbreak;\n+\tcase ColorSpace::YcbcrEncoding::Rec2020:\n+\t\tcolorimetry.matrix = GST_VIDEO_COLOR_MATRIX_BT2020;\n+\t\tbreak;\n+\t}\n+\n+\tswitch (colorSpace.range) {\n+\tcase ColorSpace::Range::Full:\n+\t\tcolorimetry.range = GST_VIDEO_COLOR_RANGE_0_255;\n+\t\tbreak;\n+\tcase ColorSpace::Range::Limited:\n+\t\tcolorimetry.range = GST_VIDEO_COLOR_RANGE_16_235;\n+\t\tbreak;\n+\t}\n+\n+\treturn colorimetry;\n+}\n+\n+static ColorSpace\n+colorspace_from_colorimetry(const GstVideoColorimetry &colorimetry)\n+{\n+\tColorSpace colorspace = ColorSpace::Raw;\n+\n+\tswitch (colorimetry.primaries) {\n+\tcase GST_VIDEO_COLOR_PRIMARIES_UNKNOWN:\n+\t\t/* Unknown primaries map to raw colorspace in gstreamer */\n+\t\treturn ColorSpace::Raw;\n+\tcase GST_VIDEO_COLOR_PRIMARIES_SMPTE170M:\n+\t\tcolorspace.primaries = ColorSpace::Primaries::Smpte170m;\n+\t\tbreak;\n+\tcase GST_VIDEO_COLOR_PRIMARIES_BT709:\n+\t\tcolorspace.primaries = ColorSpace::Primaries::Rec709;\n+\t\tbreak;\n+\tcase GST_VIDEO_COLOR_PRIMARIES_BT2020:\n+\t\tcolorspace.primaries = ColorSpace::Primaries::Rec2020;\n+\t\tbreak;\n+\tdefault:\n+\t\tGST_WARNING(\"Colorimetry primaries %d not mapped in gstlibcamera\",\n+\t\t\t colorimetry.primaries);\n+\t\treturn ColorSpace::Raw;\n+\t}\n+\n+\tswitch (colorimetry.transfer) {\n+\t/* Transfer function mappings inspired from v4l2src plugin */\n+\tcase GST_VIDEO_TRANSFER_GAMMA18:\n+\tcase GST_VIDEO_TRANSFER_GAMMA20:\n+\tcase GST_VIDEO_TRANSFER_GAMMA22:\n+\tcase GST_VIDEO_TRANSFER_GAMMA28:\n+\t\tGST_WARNING(\"GAMMA 18, 20, 22, 28 transfer functions not supported\");\n+\t/* fallthrough */\n+\tcase GST_VIDEO_TRANSFER_GAMMA10:\n+\t\tcolorspace.transferFunction = ColorSpace::TransferFunction::Linear;\n+\t\tbreak;\n+\tcase GST_VIDEO_TRANSFER_SRGB:\n+\t\tcolorspace.transferFunction = ColorSpace::TransferFunction::Srgb;\n+\t\tbreak;\n+\tcase GST_VIDEO_TRANSFER_BT601:\n+\tcase GST_VIDEO_TRANSFER_BT2020_12:\n+\tcase GST_VIDEO_TRANSFER_BT2020_10:\n+\tcase GST_VIDEO_TRANSFER_BT709:\n+\t\tcolorspace.transferFunction = ColorSpace::TransferFunction::Rec709;\n+\t\tbreak;\n+\tdefault:\n+\t\tGST_WARNING(\"Colorimetry transfer function %d not mapped in gstlibcamera\",\n+\t\t\t colorimetry.transfer);\n+\t\treturn ColorSpace::Raw;\n+\t}\n+\n+\tswitch (colorimetry.matrix) {\n+\tcase GST_VIDEO_COLOR_MATRIX_RGB:\n+\t\tcolorspace.ycbcrEncoding = ColorSpace::YcbcrEncoding::None;\n+\t\tbreak;\n+\t/* FCC is about the same as BT601 with less digit */\n+\tcase GST_VIDEO_COLOR_MATRIX_FCC:\n+\tcase GST_VIDEO_COLOR_MATRIX_BT601:\n+\t\tcolorspace.ycbcrEncoding = ColorSpace::YcbcrEncoding::Rec601;\n+\t\tbreak;\n+\tcase GST_VIDEO_COLOR_MATRIX_BT709:\n+\t\tcolorspace.ycbcrEncoding = ColorSpace::YcbcrEncoding::Rec709;\n+\t\tbreak;\n+\tcase GST_VIDEO_COLOR_MATRIX_BT2020:\n+\t\tcolorspace.ycbcrEncoding = ColorSpace::YcbcrEncoding::Rec2020;\n+\t\tbreak;\n+\tdefault:\n+\t\tGST_WARNING(\"Colorimetry matrix %d not mapped in gstlibcamera\",\n+\t\t\t colorimetry.matrix);\n+\t\treturn ColorSpace::Raw;\n+\t}\n+\n+\tswitch (colorimetry.range) {\n+\tcase GST_VIDEO_COLOR_RANGE_0_255:\n+\t\tcolorspace.range = ColorSpace::Range::Full;\n+\t\tbreak;\n+\tcase GST_VIDEO_COLOR_RANGE_16_235:\n+\t\tcolorspace.range = ColorSpace::Range::Limited;\n+\t\tbreak;\n+\tdefault:\n+\t\tGST_WARNING(\"Colorimetry range %d not mapped in gstlibcamera\",\n+\t\t\t colorimetry.range);\n+\t\treturn ColorSpace::Raw;\n+\t}\n+\n+\treturn colorspace;\n+}\n+\n static GstVideoFormat\n pixel_format_to_gst_format(const PixelFormat &format)\n {\n@@ -139,6 +285,18 @@ gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg\n \t\t\t \"width\", G_TYPE_INT, stream_cfg.size.width,\n \t\t\t \"height\", G_TYPE_INT, stream_cfg.size.height,\n \t\t\t nullptr);\n+\n+\tif (stream_cfg.colorSpace) {\n+\t\tGstVideoColorimetry colorimetry = colorimetry_from_colorspace(stream_cfg.colorSpace.value());\n+\t\tgchar *colorimetry_str = gst_video_colorimetry_to_string(&colorimetry);\n+\n+\t\tif (colorimetry_str)\n+\t\t\tgst_structure_set(s, \"colorimetry\", G_TYPE_STRING, colorimetry_str, nullptr);\n+\t\telse\n+\t\t\tg_error(\"Got invalid colorimetry from ColorSpace: %s\",\n+\t\t\t\tColorSpace::toString(stream_cfg.colorSpace).c_str());\n+\t}\n+\n \tgst_caps_append_structure(caps, s);\n \n \treturn caps;\n", "prefixes": [ "libcamera-devel", "v1", "1/2" ] }