Patch Detail
Show a patch.
GET /api/1.1/patches/14976/?format=api
{ "id": 14976, "url": "https://patchwork.libcamera.org/api/1.1/patches/14976/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14976/", "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": "<20211201154434.23127-4-david.plowman@raspberrypi.com>", "date": "2021-12-01T15:44:29", "name": "[libcamera-devel,v8,3/8] libcamera: Convert between ColorSpace class and V4L2 formats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "2692ea9fb6a794c725c282d503394292c4bde053", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/1.1/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14976/mbox/", "series": [ { "id": 2797, "url": "https://patchwork.libcamera.org/api/1.1/series/2797/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2797", "date": "2021-12-01T15:44:26", "name": "Colour spaces", "version": 8, "mbox": "https://patchwork.libcamera.org/series/2797/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14976/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14976/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 66F3DBDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 1 Dec 2021 15:45:09 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 125C7607D2;\n\tWed, 1 Dec 2021 16:45:09 +0100 (CET)", "from mail-wr1-x435.google.com (mail-wr1-x435.google.com\n\t[IPv6:2a00:1450:4864:20::435])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6491B607CB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Dec 2021 16:45:05 +0100 (CET)", "by mail-wr1-x435.google.com with SMTP id t9so36265822wrx.7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 01 Dec 2021 07:45:05 -0800 (PST)", "from pi4-davidp.pitowers.org\n\t([2a00:1098:3142:14:e4a2:3070:eea4:e434])\n\tby smtp.gmail.com with ESMTPSA id\n\ty7sm148209wrw.55.2021.12.01.07.45.04\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 01 Dec 2021 07:45:04 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"P3FZS8A0\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=Ca56FPRLmW1i0SvhL9TsMbr7XLmHJto6AuJCbYbCA+k=;\n\tb=P3FZS8A0gAubQqPu09LJTaIWUy8lOme/DIewqm84+Fn0fWks5rWx5CbKmwKXOtcJTo\n\thgb8AxxAU/mMp51Cj/f4yZ7f3oP4de4bXqGFMlJWNJCnDmsBa2GSpyPIPKjVfOlDlZ7Y\n\tctpaBEBJpxuNp6Qu8YXCFFPT8AuIhp487ssg86YFAd3QnhIGa1Dab0P/yx6lyXOkh9KA\n\tkhunhsJqpSdvcAR1z10jTodZblwsX4Rq6SxJaTHJHpTRQc/qteIBAis2ghrPNlCg9wcu\n\tahTYHVAHW1QslBGrX3feWR5ynfJWnFoMxyPGFqgPnxEyN847w909P3SNt8wju0pk2TJ2\n\tGN7A==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=Ca56FPRLmW1i0SvhL9TsMbr7XLmHJto6AuJCbYbCA+k=;\n\tb=i5hWCkOIrja6k7DPXV9iDnm0kepEM4ZUxXZtMAuM8oD+Gs/SuIwA/ysM9tOfhlCPEM\n\tUj+MG1YIVjowM8db82TJJjkPB+KWVWWJx62iGSKA8jP5ugIgOi0HwFDGEq+YIoevhgiA\n\t6RQzqe2B66VRHcWwY7aRyFz5CcwQAVKicKn3uol2DppqtCBxml1XQROgm3WW8DWbXki7\n\tdSPpxDNp/tCT2yiDpAH//sQZvfLYnp31kKTYfvzw1dFuV9g5RUJ502oiLF9i6fjSWHQi\n\t3KVY9xt0kQYtl+k9jwvKFKpgEGq348XLEN6yVJlo9i0rNHwdkDBvSWGbd0yoma1Oa1rN\n\tF4Xg==", "X-Gm-Message-State": "AOAM532vmW3jJL9ryKNTNWuQ5+kDkjPFDP19iDSAASqEySWrbX1U6Ckp\n\tzUpEOmMfev3zjBMKwB7TdxCErRAdWx1tqIcS", "X-Google-Smtp-Source": "ABdhPJw0Ug83N3tajUzzIXQoTczM+hgOtGFZLl3gEyG8Xq+Z+l0BRr6QnjuayNUseSDW41xW5ZzjmQ==", "X-Received": "by 2002:adf:d1e3:: with SMTP id g3mr7865116wrd.300.1638373504882;\n\tWed, 01 Dec 2021 07:45:04 -0800 (PST)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tJacopo Mondi <jacopo@jmondi.org>,\n\tHans Verkuil <hverkuil-cisco@xs4all.nl>, \n\tTomasz Figa <tfiga@google.com>, Naushir Patuck <naush@raspberrypi.com>", "Date": "Wed, 1 Dec 2021 15:44:29 +0000", "Message-Id": "<20211201154434.23127-4-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20211201154434.23127-1-david.plowman@raspberrypi.com>", "References": "<20211201154434.23127-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v8 3/8] libcamera: Convert between\n\tColorSpace class and V4L2 formats", "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": "Add functions to the V4L2Device class to convert to and from\nlibcamera ColorSpace.\n\nThese methods are added to the base V4L2Device class so that they can\nbe shared both by the video device class and subdevices.\n\nWith the ColorSpace class, the color space and related other fields\nare stored together, corresponding to a number of fields in the\nvarious different V4L2 format structures. Template methods are\ntherefore a convenient implementation, and we must explicitly\ninstantiate the templates that will be needed.\n\nNote that unset color spaces are converted to requests for the\ndevice's \"default\" color space.\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\n---\n include/libcamera/internal/v4l2_device.h | 7 +\n src/libcamera/v4l2_device.cpp | 192 +++++++++++++++++++++++\n 2 files changed, 199 insertions(+)", "diff": "diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h\nindex 7816a290..7f9b0f42 100644\n--- a/include/libcamera/internal/v4l2_device.h\n+++ b/include/libcamera/internal/v4l2_device.h\n@@ -17,6 +17,7 @@\n #include <libcamera/base/signal.h>\n #include <libcamera/base/span.h>\n \n+#include <libcamera/color_space.h>\n #include <libcamera/controls.h>\n \n namespace libcamera {\n@@ -44,6 +45,12 @@ public:\n \n \tvoid updateControlInfo();\n \n+\ttemplate<typename T>\n+\tstatic std::optional<ColorSpace> toColorSpace(const T &v4l2Format);\n+\n+\ttemplate<typename T>\n+\tstatic int fromColorSpace(const std::optional<ColorSpace> &colorSpace, T &v4l2Format);\n+\n protected:\n \tV4L2Device(const std::string &deviceNode);\n \t~V4L2Device();\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 9c783c9c..df92fa9e 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -16,6 +16,8 @@\n #include <sys/syscall.h>\n #include <unistd.h>\n \n+#include <linux/v4l2-mediabus.h>\n+\n #include <libcamera/base/event_notifier.h>\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n@@ -731,4 +733,194 @@ void V4L2Device::eventAvailable()\n \tframeStart.emit(event.u.frame_sync.frame_sequence);\n }\n \n+static const std::map<uint32_t, ColorSpace> v4l2ToColorSpace = {\n+\t{ V4L2_COLORSPACE_RAW, ColorSpace::Raw },\n+\t{ V4L2_COLORSPACE_JPEG, ColorSpace::Jpeg },\n+\t{ V4L2_COLORSPACE_SRGB, ColorSpace::Srgb },\n+\t{ V4L2_COLORSPACE_SMPTE170M, ColorSpace::Smpte170m },\n+\t{ V4L2_COLORSPACE_REC709, ColorSpace::Rec709 },\n+\t{ V4L2_COLORSPACE_BT2020, ColorSpace::Rec2020 },\n+};\n+\n+static const std::map<uint32_t, ColorSpace::YcbcrEncoding> v4l2ToYcbcrEncoding = {\n+\t{ V4L2_YCBCR_ENC_601, ColorSpace::YcbcrEncoding::Rec601 },\n+\t{ V4L2_YCBCR_ENC_709, ColorSpace::YcbcrEncoding::Rec709 },\n+\t{ V4L2_YCBCR_ENC_BT2020, ColorSpace::YcbcrEncoding::Rec2020 },\n+};\n+\n+static const std::map<uint32_t, ColorSpace::TransferFunction> v4l2ToTransferFunction = {\n+\t{ V4L2_XFER_FUNC_NONE, ColorSpace::TransferFunction::Linear },\n+\t{ V4L2_XFER_FUNC_SRGB, ColorSpace::TransferFunction::Srgb },\n+\t{ V4L2_XFER_FUNC_709, ColorSpace::TransferFunction::Rec709 },\n+};\n+\n+static const std::map<uint32_t, ColorSpace::Range> v4l2ToRange = {\n+\t{ V4L2_QUANTIZATION_FULL_RANGE, ColorSpace::Range::Full },\n+\t{ V4L2_QUANTIZATION_LIM_RANGE, ColorSpace::Range::Limited },\n+};\n+\n+static const std::vector<std::pair<ColorSpace, v4l2_colorspace>> colorSpaceToV4l2 = {\n+\t{ ColorSpace::Raw, V4L2_COLORSPACE_RAW },\n+\t{ ColorSpace::Jpeg, V4L2_COLORSPACE_JPEG },\n+\t{ ColorSpace::Srgb, V4L2_COLORSPACE_SRGB },\n+\t{ ColorSpace::Smpte170m, V4L2_COLORSPACE_SMPTE170M },\n+\t{ ColorSpace::Rec709, V4L2_COLORSPACE_REC709 },\n+\t{ ColorSpace::Rec2020, V4L2_COLORSPACE_BT2020 },\n+};\n+\n+static const std::map<ColorSpace::Primaries, v4l2_colorspace> primariesToV4l2 = {\n+\t{ ColorSpace::Primaries::Raw, V4L2_COLORSPACE_RAW },\n+\t{ ColorSpace::Primaries::Smpte170m, V4L2_COLORSPACE_SMPTE170M },\n+\t{ ColorSpace::Primaries::Rec709, V4L2_COLORSPACE_REC709 },\n+\t{ ColorSpace::Primaries::Rec2020, V4L2_COLORSPACE_BT2020 },\n+};\n+\n+static const std::map<ColorSpace::YcbcrEncoding, v4l2_ycbcr_encoding> ycbcrEncodingToV4l2 = {\n+\t{ ColorSpace::YcbcrEncoding::Rec601, V4L2_YCBCR_ENC_601 },\n+\t{ ColorSpace::YcbcrEncoding::Rec709, V4L2_YCBCR_ENC_709 },\n+\t{ ColorSpace::YcbcrEncoding::Rec2020, V4L2_YCBCR_ENC_BT2020 },\n+};\n+\n+static const std::map<ColorSpace::TransferFunction, v4l2_xfer_func> transferFunctionToV4l2 = {\n+\t{ ColorSpace::TransferFunction::Linear, V4L2_XFER_FUNC_NONE },\n+\t{ ColorSpace::TransferFunction::Srgb, V4L2_XFER_FUNC_SRGB },\n+\t{ ColorSpace::TransferFunction::Rec709, V4L2_XFER_FUNC_709 },\n+};\n+\n+static const std::map<ColorSpace::Range, v4l2_quantization> rangeToV4l2 = {\n+\t{ ColorSpace::Range::Full, V4L2_QUANTIZATION_FULL_RANGE },\n+\t{ ColorSpace::Range::Limited, V4L2_QUANTIZATION_LIM_RANGE },\n+};\n+\n+/**\n+ * \\brief Convert the color space fields in a V4L2 format to a ColorSpace\n+ * \\param[in] v4l2Format A V4L2 format containing color space information\n+ *\n+ * The colorspace, ycbcr_enc, xfer_func and quantization fields within a\n+ * V4L2 format structure are converted to a corresponding ColorSpace.\n+ *\n+ * If any V4L2 fields are not recognised then we return an \"unset\"\n+ * color space.\n+ *\n+ * \\return The ColorSpace corresponding to the input V4L2 format\n+ * \\retval std::nullopt One or more V4L2 color space fields were not recognised\n+ */\n+template<typename T>\n+std::optional<ColorSpace> V4L2Device::toColorSpace(const T &v4l2Format)\n+{\n+\tauto itColor = v4l2ToColorSpace.find(v4l2Format.colorspace);\n+\tif (itColor == v4l2ToColorSpace.end())\n+\t\treturn std::nullopt;\n+\n+\t/* This sets all the color space fields to the correct \"default\" values. */\n+\tColorSpace colorSpace = itColor->second;\n+\n+\tif (v4l2Format.ycbcr_enc != V4L2_YCBCR_ENC_DEFAULT) {\n+\t\tauto itYcbcrEncoding = v4l2ToYcbcrEncoding.find(v4l2Format.ycbcr_enc);\n+\t\tif (itYcbcrEncoding == v4l2ToYcbcrEncoding.end())\n+\t\t\treturn std::nullopt;\n+\n+\t\tcolorSpace.ycbcrEncoding = itYcbcrEncoding->second;\n+\t}\n+\n+\tif (v4l2Format.xfer_func != V4L2_XFER_FUNC_DEFAULT) {\n+\t\tauto itTransfer = v4l2ToTransferFunction.find(v4l2Format.xfer_func);\n+\t\tif (itTransfer == v4l2ToTransferFunction.end())\n+\t\t\treturn std::nullopt;\n+\n+\t\tcolorSpace.transferFunction = itTransfer->second;\n+\t}\n+\n+\tif (v4l2Format.quantization != V4L2_QUANTIZATION_DEFAULT) {\n+\t\tauto itRange = v4l2ToRange.find(v4l2Format.quantization);\n+\t\tif (itRange == v4l2ToRange.end())\n+\t\t\treturn std::nullopt;\n+\n+\t\tcolorSpace.range = itRange->second;\n+\t}\n+\n+\treturn colorSpace;\n+}\n+\n+template std::optional<ColorSpace> V4L2Device::toColorSpace(const struct v4l2_pix_format &);\n+template std::optional<ColorSpace> V4L2Device::toColorSpace(const struct v4l2_pix_format_mplane &);\n+template std::optional<ColorSpace> V4L2Device::toColorSpace(const struct v4l2_mbus_framefmt &);\n+\n+/**\n+ * \\brief Fill in the color space fields of a V4L2 format from a ColorSpace\n+ * \\param[in] colorSpace The ColorSpace to be converted\n+ * \\param[out] v4l2Format A V4L2 format containing color space information\n+ *\n+ * The colorspace, ycbcr_enc, xfer_func and quantization fields within a\n+ * V4L2 format structure are filled in from a corresponding ColorSpace.\n+ *\n+ * An error is returned if any of the V4L2 fields do not support the\n+ * value given in the ColorSpace. Such fields are set to the V4L2\n+ * \"default\" values, but all other fields are still filled in where\n+ * possible.\n+ *\n+ * If the color space is completely unset, \"default\" V4L2 values are used\n+ * everywhere, so a driver would then choose its preferred color space.\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ * \\retval -EINVAL The ColorSpace does not have a representation using V4L2 enums\n+ */\n+template<typename T>\n+int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &colorSpace, T &v4l2Format)\n+{\n+\tv4l2Format.colorspace = V4L2_COLORSPACE_DEFAULT;\n+\tv4l2Format.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;\n+\tv4l2Format.xfer_func = V4L2_XFER_FUNC_DEFAULT;\n+\tv4l2Format.quantization = V4L2_QUANTIZATION_DEFAULT;\n+\n+\tif (!colorSpace)\n+\t\treturn 0;\n+\n+\tauto itColor = std::find_if(colorSpaceToV4l2.begin(), colorSpaceToV4l2.end(),\n+\t\t\t\t [&colorSpace](const auto &item) {\n+\t\t\t\t\t return colorSpace == item.first;\n+\t\t\t\t });\n+\tif (itColor != colorSpaceToV4l2.end()) {\n+\t\tv4l2Format.colorspace = itColor->second;\n+\t\t/* Leaving all the other fields as \"default\" should be fine. */\n+\t\treturn 0;\n+\t}\n+\n+\t/*\n+\t * If the colorSpace doesn't precisely match a standard color space,\n+\t * then we must choose a V4L2 colorspace with matching primaries.\n+\t */\n+\tint ret = 0;\n+\n+\tauto itPrimaries = primariesToV4l2.find(colorSpace->primaries);\n+\tif (itPrimaries != primariesToV4l2.end())\n+\t\tv4l2Format.colorspace = itPrimaries->second;\n+\telse\n+\t\tret = -EINVAL;\n+\n+\tauto itYcbcrEncoding = ycbcrEncodingToV4l2.find(colorSpace->ycbcrEncoding);\n+\tif (itYcbcrEncoding != ycbcrEncodingToV4l2.end())\n+\t\tv4l2Format.ycbcr_enc = itYcbcrEncoding->second;\n+\telse\n+\t\tret = -EINVAL;\n+\n+\tauto itTransfer = transferFunctionToV4l2.find(colorSpace->transferFunction);\n+\tif (itTransfer != transferFunctionToV4l2.end())\n+\t\tv4l2Format.xfer_func = itTransfer->second;\n+\telse\n+\t\tret = -EINVAL;\n+\n+\tauto itRange = rangeToV4l2.find(colorSpace->range);\n+\tif (itRange != rangeToV4l2.end())\n+\t\tv4l2Format.quantization = itRange->second;\n+\telse\n+\t\tret = -EINVAL;\n+\n+\treturn ret;\n+}\n+\n+template int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &, struct v4l2_pix_format &);\n+template int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &, struct v4l2_pix_format_mplane &);\n+template int V4L2Device::fromColorSpace(const std::optional<ColorSpace> &, struct v4l2_mbus_framefmt &);\n+\n } /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "v8", "3/8" ] }