Patch Detail
Show a patch.
GET /api/patches/15108/?format=api
{ "id": 15108, "url": "https://patchwork.libcamera.org/api/patches/15108/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15108/", "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": "<20211210112142.18441-5-david.plowman@raspberrypi.com>", "date": "2021-12-10T11:21:38", "name": "[libcamera-devel,v11,4/8] libcamera: video_device: Support passing ColorSpaces to V4L2 video devices", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a88fac33579696da80083b403f8913f1b22d03c7", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15108/mbox/", "series": [ { "id": 2834, "url": "https://patchwork.libcamera.org/api/series/2834/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2834", "date": "2021-12-10T11:21:34", "name": "Colour spaces", "version": 11, "mbox": "https://patchwork.libcamera.org/series/2834/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15108/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15108/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 74081C324B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 10 Dec 2021 11:22:11 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1A0CB60890;\n\tFri, 10 Dec 2021 12:22:11 +0100 (CET)", "from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com\n\t[IPv6:2a00:1450:4864:20::32c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2D5876088E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Dec 2021 12:22:06 +0100 (CET)", "by mail-wm1-x32c.google.com with SMTP id\n\tp27-20020a05600c1d9b00b0033bf8532855so6373888wms.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Dec 2021 03:22:06 -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\tz18sm2198469wrq.11.2021.12.10.03.22.05\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 10 Dec 2021 03:22:05 -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=\"ib1+ckSw\"; 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=dNFIU7MwMl9M/WUUAajbXcsy7xJkXDsMafgWJxChUOM=;\n\tb=ib1+ckSwjnbO4pAmcxGeaXkEJ8tfxlBHi/6Xho4CaHJwXmZpb9vANBKonYeAQxveBN\n\tcX6GapcBNB2Xr6VHXnauPj1t0iPWERcTqsVZH9LQPfI1i2PJcJUcQhOtW+yDeueyfVBB\n\tWnZncdiYsyCU6kfUZKimOu1xDPFcUStAgN+Yfg6hUfhGtQRkhKe2/+x+0o41l8/edob5\n\tXdt6a049biFzJygg76ONisNaOPjECXGQOZxRG0djnEAM8Rpw4AjWwt28pxPUHoORv93n\n\tXlAaEXNIVEcJb7mOgR5vATsKnzfb1EGTl2t9hsAhZdH/8UAk0LktfIErcu3qm6+AxLhO\n\te/VA==", "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=dNFIU7MwMl9M/WUUAajbXcsy7xJkXDsMafgWJxChUOM=;\n\tb=QgLA04HjJ6MgO5Q0THhu7hf5bTbbculN3ftXT9O98Cr940y6jUGoS5ctrdFTRJBWQ5\n\tHoEN5ldAfv8AhDvpO5P6PK4O6ftimIBxYe3EIkgKneURWZbi6U7Ku42+3ovi/wxy40iJ\n\t6sl0aHhGI0gbCPbXzuaIsvW5W3i43WlAb56rvhfI7oE7HQb2pFShMCqUfy8hbqItgJ0K\n\ttUYdd6h86zPPAptYPV/GLGML5DwZ5Te3dw4YbZCq/Mn/Mw4KJcIRBMFZ5uB9Zhb/ObEL\n\ttLy++VZjkdn88KAYCUTOzrVqOw6m+UbDMDDT5K7/N2Q8xLyxgYhtDZcJx6TtZYe8rzTX\n\tDR9w==", "X-Gm-Message-State": "AOAM5331FaBVKJGyTXB3/aXajyOmEod99ZoACK02/tTnZ3luej2uEs26\n\tKpLshiSrsCCyf3byAVYS6q9l/Q==", "X-Google-Smtp-Source": "ABdhPJwyenTbeq+1fZCYd4ypXMro0rGDXe1K22W84Q7GCD33R/aRFuFCip4GmnH3YJLwAgPDGVYHIA==", "X-Received": "by 2002:a05:600c:1d06:: with SMTP id\n\tl6mr15069142wms.97.1639135325889; \n\tFri, 10 Dec 2021 03:22:05 -0800 (PST)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tHans Verkuil <hverkuil-cisco@xs4all.nl>, Tomasz Figa <tfiga@google.com>, \n\tJacopo Mondi <jacopo@jmondi.org>,\n\tNaushir Patuck <naush@raspberrypi.com>, \n\tlibcamera-devel@lists.libcamera.org", "Date": "Fri, 10 Dec 2021 11:21:38 +0000", "Message-Id": "<20211210112142.18441-5-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20211210112142.18441-1-david.plowman@raspberrypi.com>", "References": "<20211210112142.18441-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v11 4/8] libcamera: video_device: Support\n\tpassing ColorSpaces to V4L2 video devices", "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": "The ColorSpace from the StreamConfiguration is now handled\nappropriately in the V4L2VideoDevice.\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/internal/v4l2_videodevice.h | 3 ++\n src/libcamera/v4l2_videodevice.cpp | 32 +++++++++++++++++++\n 2 files changed, 35 insertions(+)", "diff": "diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\nindex 9b2ec3af..2d2ccc47 100644\n--- a/include/libcamera/internal/v4l2_videodevice.h\n+++ b/include/libcamera/internal/v4l2_videodevice.h\n@@ -10,6 +10,7 @@\n #include <array>\n #include <atomic>\n #include <memory>\n+#include <optional>\n #include <stdint.h>\n #include <string>\n #include <vector>\n@@ -21,6 +22,7 @@\n #include <libcamera/base/signal.h>\n #include <libcamera/base/unique_fd.h>\n \n+#include <libcamera/color_space.h>\n #include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n #include <libcamera/pixel_format.h>\n@@ -167,6 +169,7 @@ public:\n \n \tV4L2PixelFormat fourcc;\n \tSize size;\n+\tstd::optional<ColorSpace> colorSpace;\n \n \tstd::array<Plane, 3> planes;\n \tunsigned int planesCount = 0;\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex b4b89e27..80a8c8e4 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -383,6 +383,21 @@ bool V4L2BufferCache::Entry::operator==(const FrameBuffer &buffer) const\n * that identifies the image format pixel encoding scheme.\n */\n \n+/**\n+ * \\var V4L2DeviceFormat::colorSpace\n+ * \\brief The color space of the pixels\n+ *\n+ * The color space of the image. When setting the format this may be\n+ * unset, in which case the driver gets to use its default color space.\n+ * After being set, this value should contain the color space that\n+ * was actually used. If this value is unset, then the color space chosen\n+ * by the driver could not be represented by the ColorSpace class (and\n+ * should probably be added).\n+ *\n+ * It is up to the pipeline handler or application to check if the\n+ * resulting color space is acceptable.\n+ */\n+\n /**\n * \\var V4L2DeviceFormat::planes\n * \\brief The per-plane memory size information\n@@ -871,6 +886,7 @@ int V4L2VideoDevice::getFormatMultiplane(V4L2DeviceFormat *format)\n \tformat->size.height = pix->height;\n \tformat->fourcc = V4L2PixelFormat(pix->pixelformat);\n \tformat->planesCount = pix->num_planes;\n+\tformat->colorSpace = toColorSpace(*pix);\n \n \tfor (unsigned int i = 0; i < format->planesCount; ++i) {\n \t\tformat->planes[i].bpl = pix->plane_fmt[i].bytesperline;\n@@ -893,6 +909,12 @@ int V4L2VideoDevice::trySetFormatMultiplane(V4L2DeviceFormat *format, bool set)\n \tpix->num_planes = format->planesCount;\n \tpix->field = V4L2_FIELD_NONE;\n \n+\tret = fromColorSpace(format->colorSpace, *pix);\n+\tif (ret < 0)\n+\t\tLOG(V4L2, Warning)\n+\t\t\t<< \"Setting color space unrecognised by V4L2: \"\n+\t\t\t<< ColorSpace::toString(format->colorSpace);\n+\n \tASSERT(pix->num_planes <= std::size(pix->plane_fmt));\n \n \tfor (unsigned int i = 0; i < pix->num_planes; ++i) {\n@@ -920,6 +942,7 @@ int V4L2VideoDevice::trySetFormatMultiplane(V4L2DeviceFormat *format, bool set)\n \t\tformat->planes[i].bpl = pix->plane_fmt[i].bytesperline;\n \t\tformat->planes[i].size = pix->plane_fmt[i].sizeimage;\n \t}\n+\tformat->colorSpace = toColorSpace(*pix);\n \n \treturn 0;\n }\n@@ -943,6 +966,7 @@ int V4L2VideoDevice::getFormatSingleplane(V4L2DeviceFormat *format)\n \tformat->planesCount = 1;\n \tformat->planes[0].bpl = pix->bytesperline;\n \tformat->planes[0].size = pix->sizeimage;\n+\tformat->colorSpace = toColorSpace(*pix);\n \n \treturn 0;\n }\n@@ -959,6 +983,13 @@ int V4L2VideoDevice::trySetFormatSingleplane(V4L2DeviceFormat *format, bool set)\n \tpix->pixelformat = format->fourcc;\n \tpix->bytesperline = format->planes[0].bpl;\n \tpix->field = V4L2_FIELD_NONE;\n+\n+\tret = fromColorSpace(format->colorSpace, *pix);\n+\tif (ret < 0)\n+\t\tLOG(V4L2, Warning)\n+\t\t\t<< \"Set color space unrecognised by V4L2: \"\n+\t\t\t<< ColorSpace::toString(format->colorSpace);\n+\n \tret = ioctl(set ? VIDIOC_S_FMT : VIDIOC_TRY_FMT, &v4l2Format);\n \tif (ret) {\n \t\tLOG(V4L2, Error)\n@@ -977,6 +1008,7 @@ int V4L2VideoDevice::trySetFormatSingleplane(V4L2DeviceFormat *format, bool set)\n \tformat->planesCount = 1;\n \tformat->planes[0].bpl = pix->bytesperline;\n \tformat->planes[0].size = pix->sizeimage;\n+\tformat->colorSpace = toColorSpace(*pix);\n \n \treturn 0;\n }\n", "prefixes": [ "libcamera-devel", "v11", "4/8" ] }