{"id":14977,"url":"https://patchwork.libcamera.org/api/1.1/patches/14977/?format=json","web_url":"https://patchwork.libcamera.org/patch/14977/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","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-5-david.plowman@raspberrypi.com>","date":"2021-12-01T15:44:30","name":"[libcamera-devel,v8,4/8] libcamera: Support passing ColorSpaces to V4L2 video devices","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2f0bfb63714ea8b0462c4c1fdc0c06944427fd07","submitter":{"id":42,"url":"https://patchwork.libcamera.org/api/1.1/people/42/?format=json","name":"David Plowman","email":"david.plowman@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14977/mbox/","series":[{"id":2797,"url":"https://patchwork.libcamera.org/api/1.1/series/2797/?format=json","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/14977/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14977/checks/","tags":{},"headers":{"Return-Path":"","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 B7213C3250\n\tfor ;\n\tWed, 1 Dec 2021 15:45:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4EB16607DE;\n\tWed, 1 Dec 2021 16:45:10 +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 163C160746\n\tfor ;\n\tWed, 1 Dec 2021 16:45:06 +0100 (CET)","by mail-wr1-x435.google.com with SMTP id u1so53210497wru.13\n\tfor ;\n\tWed, 01 Dec 2021 07:45: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\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: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=\"Vtk4QZJl\"; 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=wHD2U/BDIz9i1ybZ6mxu9fSHa6cLozW0JrsZbuoIEVw=;\n\tb=Vtk4QZJlvHvPpEOSakoDrBqib5D38hSOVoPvxh1wu6dvtOLPC1AXaKwvuZfY4cmWw+\n\tcxjy73psjMOg4beSzfiFIWipP56WZ4LDwJ1QKrTqLl8u++Oec2aX88PRlCUSVZ3SIr+k\n\tNDmq6TXidgeet4V9ZtENqUWVGr/0GORQnTObbSpouFlPcgQpDuitWLT+RMWJ9gYlZjnh\n\t5svusblEiyS67u0HBpyYj5/SnGlyuW2Sjq4JV8epIbSt87hcquh8sn7f0hCCOZtC9cLt\n\t788IdMu+KBQzmrvUGw3Qswos+CEw5KdgM5NqyI5AjfonFxatHiRGNE0hzNvrgx2dyNdI\n\tSjGg==","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=wHD2U/BDIz9i1ybZ6mxu9fSHa6cLozW0JrsZbuoIEVw=;\n\tb=BR9aRfQILIudZT0oRRQPw/u/LZGSZ7RKxYeujTVBcH5lURjraESm4p0If7lGESAVf9\n\tKGrOnbnksgPSFgciv6Yfj/n5H97EYPhognUQUNudrdhSQXi9FKXAN90CzQQ7UXzQSXOB\n\tMk7oDu3oe7Otfxi1pf80Mlfqtw96UPzl/u7LBKW8DrYD1b6iur0s22ayBXXsLg6ADUID\n\tVXnbs9LzTA9Xw7VupfXKJhN/VzplZ0ZsxcSNzqOXzXktg1P1MKt8yOn/NMknGNtiJ2OQ\n\tEb0Y1QCBc9LwF2V4Fd9PhrNyrhoxGRdxia8beDUZsDZd/We9/IjN+sptHbmFKbiEokbd\n\tIsUw==","X-Gm-Message-State":"AOAM5319Ko0vCbn4KKVheBRMXw19/EKBU1kBXRyxlrYN9/1K5vwIhGbC\n\t5+7dCNBBEv4znZb/va58MTqdzojSg1xnjuP+","X-Google-Smtp-Source":"ABdhPJyK2OXU0PZYRH5YrUGsOSC58KpgSoSPam4SCqv2hIb3K/STrQNFAUccXaDPRnEqduqDgBQblw==","X-Received":"by 2002:a05:6000:18a7:: with SMTP id\n\tb7mr7576214wri.308.1638373505629; \n\tWed, 01 Dec 2021 07:45:05 -0800 (PST)","From":"David Plowman ","To":"libcamera-devel@lists.libcamera.org,\n\tLaurent Pinchart ,\n\tKieran Bingham ,\n\tJacopo Mondi ,\n\tHans Verkuil , \n\tTomasz Figa , Naushir Patuck ","Date":"Wed, 1 Dec 2021 15:44:30 +0000","Message-Id":"<20211201154434.23127-5-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 4/8] libcamera: Support passing\n\tColorSpaces to V4L2 video devices","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The ColorSpace from the StreamConfiguration is now handled\nappropriately in the V4L2VideoDevice.\n\nSigned-off-by: David Plowman \n---\n include/libcamera/internal/v4l2_videodevice.h | 2 ++\n src/libcamera/v4l2_videodevice.cpp | 32 +++++++++++++++++++\n 2 files changed, 34 insertions(+)","diff":"diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\nindex 4a44b7fd..602f40fb 100644\n--- a/include/libcamera/internal/v4l2_videodevice.h\n+++ b/include/libcamera/internal/v4l2_videodevice.h\n@@ -20,6 +20,7 @@\n #include \n #include \n \n+#include \n #include \n #include \n #include \n@@ -167,6 +168,7 @@ public:\n \n \tV4L2PixelFormat fourcc;\n \tSize size;\n+\tstd::optional colorSpace;\n \n \tstd::array planes;\n \tunsigned int planesCount = 0;\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex 4f04212d..c8f78602 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@@ -878,6 +893,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@@ -900,6 +916,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@@ -927,6 +949,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@@ -950,6 +973,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@@ -966,6 +990,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@@ -984,6 +1015,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","v8","4/8"]}