Patch Detail
Show a patch.
GET /api/1.1/patches/15049/?format=api
{ "id": 15049, "url": "https://patchwork.libcamera.org/api/1.1/patches/15049/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15049/", "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": "<20211206105032.13876-9-david.plowman@raspberrypi.com>", "date": "2021-12-06T10:50:31", "name": "[libcamera-devel,v9,8/8] libcamera: pipeline: raspberrypi: Support color spaces", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "642994e9d6c9ea1fba7fb2b638b9f8889663b5a5", "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/15049/mbox/", "series": [ { "id": 2817, "url": "https://patchwork.libcamera.org/api/1.1/series/2817/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2817", "date": "2021-12-06T10:50:23", "name": "Colour spaces", "version": 9, "mbox": "https://patchwork.libcamera.org/series/2817/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15049/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15049/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 3C7F3C324B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 6 Dec 2021 10:51:32 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C4BEA60725;\n\tMon, 6 Dec 2021 11:51:31 +0100 (CET)", "from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com\n\t[IPv6:2a00:1450:4864:20::32d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 50B51608A4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 6 Dec 2021 11:51:26 +0100 (CET)", "by mail-wm1-x32d.google.com with SMTP id p18so7746141wmq.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 06 Dec 2021 02:51:26 -0800 (PST)", "from pi4-davidp.pitowers.org\n\t([2a00:1098:3142:14:1ce1:9965:4328:89c4])\n\tby smtp.gmail.com with ESMTPSA id\n\tr7sm10878186wrq.29.2021.12.06.02.51.25\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 06 Dec 2021 02:51:25 -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=\"tCE+VYLv\"; 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=2mECcTwXK1O2rNwFlwteHR9qSm4YdLlUAiGG44luOJs=;\n\tb=tCE+VYLvWR/uo/Gfyxyb2oNH3dhg2PcTphd1Q5ol1s2qHeMhPxbF+IPutGMZqQ+Wfd\n\ts1v+UEV0+wLBw4egy2tNoXqAmtuDnBDDPN4Vxq2XpYyVH1OT6Vuw/aViL6aCZWOPe+v5\n\tWUjHsiU2+IqXSSShxQrl2hj4AtV3XgbdzzMnHV9okuLoZqJyf2ssppOH1SUJtdktixzy\n\tLbX+T17POI4dbM+uAh5nVHIAzP3GD8pX2LliMFUHM9qKKkhXcBack+JYhjHSZlqRsOEZ\n\tg51PuXK8XPGng2QSwByxgVAKqBCphZCx4hqrnJ4CPOiJE9eH7qdErNRET49s2TlUcr3c\n\tES1A==", "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=2mECcTwXK1O2rNwFlwteHR9qSm4YdLlUAiGG44luOJs=;\n\tb=drV4gfHIAZSDP00V0vzMHpdbL2KaN2TunmdDgUC9z36P6Jk4s8JWVYwfZKEDKjpl9U\n\tnb4WSGe7XgC5hSlQmVgFvDyXvqscCNGUdo47+sRUZVdIjmlzMxc/AAiewIoJv/XKmJIp\n\tS5rviSfW+SIvVKPn441T0JUoBewGpXW8vPUmuuWLPzWrltyBRTuolATnrXxGKhG+MhyV\n\tRD64hiMfMqICbxvo9ah/zzL82r3DEnQ+0kF+Cx11QwNpJTtAP51x3kKRw1NGb2eFVsFX\n\t8tYZ6aHTYkxzcC8DDSAHtrvQsFPoS0IxXqksl2mxpbuZ9S9BTv/Cj9MErrPAPpcqfbML\n\t3MeA==", "X-Gm-Message-State": "AOAM530+B6ZokvX00nqjhMMN2UDkpazyjU7lalE2OCfoBLP2JRbLs2Ik\n\tbWTZZdSjkwUdJcr4g9hRofgnSrRvvInLA6rJ", "X-Google-Smtp-Source": "ABdhPJxkUoEKdbDhdiTZR8PVUECDf3a0GamNnVkBuXbw9TX8p+aGobzkKhQNUtftqQTF1wQv3wc6/A==", "X-Received": "by 2002:a05:600c:6d2:: with SMTP id\n\tb18mr38826167wmn.98.1638787885827; \n\tMon, 06 Dec 2021 02:51:25 -0800 (PST)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org, naush@raspberrypi.com,\n\tjacopo@jmondi.org, tfiga@google.com, hverkuil-cisco@xs4all.nl,\n\tkieran.bingham@ideasonboard.com, laurent.pinchart@ideasonboard.com", "Date": "Mon, 6 Dec 2021 10:50:31 +0000", "Message-Id": "<20211206105032.13876-9-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20211206105032.13876-1-david.plowman@raspberrypi.com>", "References": "<20211206105032.13876-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v9 8/8] libcamera: pipeline: raspberrypi:\n\tSupport color spaces", "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 Raspberry Pi pipeline handler now sets color spaces correctly.\n\nIn generateConfiguration() it sets them to reasonable default values\nbased on the stream role.\n\nvalidate() now calls validateColorSpaces() to ensure that the\nrequested color spaces are sensible, before proceeding to check what\nthe hardware can deliver.\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\n---\n .../pipeline/raspberrypi/raspberrypi.cpp | 43 +++++++++++++++++++\n 1 file changed, 43 insertions(+)", "diff": "diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 321b72ad..eb4fbf90 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -97,6 +97,7 @@ V4L2DeviceFormat toV4L2DeviceFormat(const V4L2SubdeviceFormat &format,\n \n \tdeviceFormat.fourcc = V4L2PixelFormat::fromPixelFormat(pix);\n \tdeviceFormat.size = format.size;\n+\tdeviceFormat.colorSpace = format.colorSpace;\n \treturn deviceFormat;\n }\n \n@@ -133,6 +134,7 @@ V4L2SubdeviceFormat findBestFormat(const SensorFormats &formatsMap, const Size &\n {\n \tdouble bestScore = std::numeric_limits<double>::max(), score;\n \tV4L2SubdeviceFormat bestFormat;\n+\tbestFormat.colorSpace = ColorSpace::Raw;\n \n \tconstexpr float penaltyAr = 1500.0;\n \tconstexpr float penaltyBitDepth = 500.0;\n@@ -330,6 +332,8 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \tif (config_.empty())\n \t\treturn Invalid;\n \n+\tstatus = validateColorSpaces(true);\n+\n \t/*\n \t * What if the platform has a non-90 degree rotation? We can't even\n \t * \"adjust\" the configuration and carry on. Alternatively, raising an\n@@ -497,11 +501,23 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t\tV4L2DeviceFormat format;\n \t\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n \t\tformat.size = cfg.size;\n+\t\tformat.colorSpace = cfg.colorSpace;\n+\t\tLOG(RPI, Debug)\n+\t\t\t<< \"Try color space \" << ColorSpace::toString(cfg.colorSpace);\n \n \t\tint ret = dev->tryFormat(&format);\n \t\tif (ret)\n \t\t\treturn Invalid;\n \n+\t\tif (!format.colorSpace || cfg.colorSpace != format.colorSpace) {\n+\t\t\tstatus = Adjusted;\n+\t\t\tLOG(RPI, Warning)\n+\t\t\t\t<< \"Color space changed from \"\n+\t\t\t\t<< ColorSpace::toString(cfg.colorSpace) << \" to \"\n+\t\t\t\t<< ColorSpace::toString(format.colorSpace);\n+\t\t}\n+\t\tcfg.colorSpace = format.colorSpace;\n+\n \t\tcfg.stride = format.planes[0].bpl;\n \t\tcfg.frameSize = format.planes[0].size;\n \n@@ -525,6 +541,7 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \tPixelFormat pixelFormat;\n \tV4L2VideoDevice::Formats fmts;\n \tSize size;\n+\tstd::optional<ColorSpace> colorSpace;\n \n \tif (roles.empty())\n \t\treturn config;\n@@ -539,6 +556,7 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \t\t\tpixelFormat = mbusCodeToPixelFormat(sensorFormat.mbus_code,\n \t\t\t\t\t\t\t BayerFormat::Packing::CSI2);\n \t\t\tASSERT(pixelFormat.isValid());\n+\t\t\tcolorSpace = ColorSpace::Raw;\n \t\t\tbufferCount = 2;\n \t\t\trawCount++;\n \t\t\tbreak;\n@@ -546,6 +564,7 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \t\tcase StreamRole::StillCapture:\n \t\t\tfmts = data->isp_[Isp::Output0].dev()->formats();\n \t\t\tpixelFormat = formats::NV12;\n+\t\t\tcolorSpace = ColorSpace::Jpeg;\n \t\t\t/* Return the largest sensor resolution. */\n \t\t\tsize = data->sensor_->resolution();\n \t\t\tbufferCount = 1;\n@@ -563,6 +582,8 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \t\t\t */\n \t\t\tfmts = data->isp_[Isp::Output0].dev()->formats();\n \t\t\tpixelFormat = formats::YUV420;\n+\t\t\t/* This will be reasonable for many applications. */\n+\t\t\tcolorSpace = ColorSpace::Rec709;\n \t\t\tsize = { 1920, 1080 };\n \t\t\tbufferCount = 4;\n \t\t\toutCount++;\n@@ -571,6 +592,7 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \t\tcase StreamRole::Viewfinder:\n \t\t\tfmts = data->isp_[Isp::Output0].dev()->formats();\n \t\t\tpixelFormat = formats::ARGB8888;\n+\t\t\tcolorSpace = ColorSpace::Jpeg;\n \t\t\tsize = { 800, 600 };\n \t\t\tbufferCount = 4;\n \t\t\toutCount++;\n@@ -602,6 +624,7 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \t\tStreamConfiguration cfg(formats);\n \t\tcfg.size = size;\n \t\tcfg.pixelFormat = pixelFormat;\n+\t\tcfg.colorSpace = colorSpace;\n \t\tcfg.bufferCount = bufferCount;\n \t\tconfig->addConfiguration(cfg);\n \t}\n@@ -709,6 +732,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t\tV4L2PixelFormat fourcc = V4L2PixelFormat::fromPixelFormat(cfg.pixelFormat);\n \t\tformat.size = cfg.size;\n \t\tformat.fourcc = fourcc;\n+\t\tformat.colorSpace = cfg.colorSpace;\n \n \t\tLOG(RPI, Debug) << \"Setting \" << stream->name() << \" to \"\n \t\t\t\t<< format.toString();\n@@ -724,6 +748,23 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t\t\treturn -EINVAL;\n \t\t}\n \n+\t\tif (!format.colorSpace || cfg.colorSpace != format.colorSpace) {\n+\t\t\t/*\n+\t\t\t * We should have been through validate() before so this\n+\t\t\t * shouldn't be possible, but we mustn't sweep color space\n+\t\t\t * problems under the carpet.\n+\t\t\t */\n+\t\t\tLOG(RPI, Warning)\n+\t\t\t\t<< \"Unexpected color space (\"\n+\t\t\t\t<< ColorSpace::toString(cfg.colorSpace) << \" to \"\n+\t\t\t\t<< ColorSpace::toString(format.colorSpace) << \") in stream \"\n+\t\t\t\t<< stream->name();\n+\t\t\tcfg.colorSpace = format.colorSpace;\n+\t\t}\n+\t\tLOG(RPI, Debug)\n+\t\t\t<< \"Stream \" << stream->name() << \" has color space \"\n+\t\t\t<< ColorSpace::toString(cfg.colorSpace);\n+\n \t\tcfg.setStream(stream);\n \t\tstream->setExternal(true);\n \n@@ -748,6 +789,8 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t\tformat = {};\n \t\tformat.size = maxSize;\n \t\tformat.fourcc = V4L2PixelFormat::fromPixelFormat(formats::YUV420);\n+\t\t/* No one asked for output, so the color space doesn't matter. */\n+\t\tformat.colorSpace = ColorSpace::Jpeg;\n \t\tret = data->isp_[Isp::Output0].dev()->setFormat(&format);\n \t\tif (ret) {\n \t\t\tLOG(RPI, Error)\n", "prefixes": [ "libcamera-devel", "v9", "8/8" ] }