Patch Detail
Show a patch.
GET /api/patches/23761/?format=api
{ "id": 23761, "url": "https://patchwork.libcamera.org/api/patches/23761/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23761/", "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": "<20250707155856.33436-2-mzamazal@redhat.com>", "date": "2025-07-07T15:58:46", "name": "[v9,01/10] libcamera: software_isp: Assign colour spaces in configurations", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "340741a4150b2e74d1401d81449235651c2b397c", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23761/mbox/", "series": [ { "id": 5274, "url": "https://patchwork.libcamera.org/api/series/5274/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5274", "date": "2025-07-07T15:58:45", "name": "Enable raw streams with software ISP", "version": 9, "mbox": "https://patchwork.libcamera.org/series/5274/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23761/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23761/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 63083C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 7 Jul 2025 15:59:18 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 115F868EC5;\n\tMon, 7 Jul 2025 17:59:17 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C3A5968EB6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 7 Jul 2025 17:59:13 +0200 (CEST)", "from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-584-rfERB5J9NVGq1kd6A26FiA-1;\n\tMon, 07 Jul 2025 11:59:08 -0400", "from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.40])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id CDCE91955D4E; Mon, 7 Jul 2025 15:59:06 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.129])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id D2C1619560B2; Mon, 7 Jul 2025 15:59:03 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"QTJ4GBMD\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1751903952;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=Czy+xXD1fOnM3D+B6VeIahV3hQ2Y/vFBOyTsQSQmbHY=;\n\tb=QTJ4GBMD3KdrpsfOHBRsbHOmtcX8B7ner5bBdqFEMrFq6NC8Roa9uxU/wvEkYIfAhVrxZU\n\trbTDSfLX1sJwIw462YDFOMW4cRqigoN6yDnPQdnmzW7jS/IE9l07QB8UDLS79z5x5ofzJj\n\ttMS0OP1ZHPagJ2Zti0n/ytCeDarfz2U=", "X-MC-Unique": "rfERB5J9NVGq1kd6A26FiA-1", "X-Mimecast-MFC-AGG-ID": "rfERB5J9NVGq1kd6A26FiA_1751903947", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<barnabas.pocze@ideasonboard.com>, Paul Elder\n\t<paul.elder@ideasonboard.com>, Umang Jain <uajain@igalia.com>", "Subject": "[PATCH v9 01/10] libcamera: software_isp: Assign colour spaces in\n\tconfigurations", "Date": "Mon, 7 Jul 2025 17:58:46 +0200", "Message-ID": "<20250707155856.33436-2-mzamazal@redhat.com>", "In-Reply-To": "<20250707155856.33436-1-mzamazal@redhat.com>", "References": "<20250707155856.33436-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.40", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "uTK6nhReX_K18RaroGKjTVm9dgJ9fpeFymrW6VLh85A_1751903947", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "content-type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "StreamConfiguration's should have colorSpace set. This is not the case\nin the simple pipeline. Let's set it there. This also fixes a crash in\n`cam' due to accessing an unset colorSpace.\n\nThe colour space is assigned as follows:\n\n- If raw role is requested, then the colour space must be raw,\n regardless of the stream format.\n- Otherwise, if software ISP is used, the default colour space is\n set to Srgb (YcbcrEncoding::None, Range::Full).\n- Otherwise, if a converter is used, the default colour space is left\n unset.\n- Then in configuration validation, if the pixel format is changed, the\n colour space is set according to the new pixel format.\n- If the colour space is still unset, it is set according to the\n resulting pixel format.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 38 +++++++++++++++++++++++-\n 1 file changed, 37 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex efb07051b..d45480fe7 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -25,6 +25,7 @@\n #include <libcamera/base/log.h>\n \n #include <libcamera/camera.h>\n+#include <libcamera/color_space.h>\n #include <libcamera/control_ids.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n@@ -35,6 +36,7 @@\n #include \"libcamera/internal/converter.h\"\n #include \"libcamera/internal/delayed_controls.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n+#include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n #include \"libcamera/internal/software_isp/software_isp.h\"\n@@ -1206,6 +1208,28 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n \t\tif (cfg.pixelFormat != pixelFormat) {\n \t\t\tLOG(SimplePipeline, Debug) << \"Adjusting pixel format\";\n \t\t\tcfg.pixelFormat = pixelFormat;\n+\t\t\t/*\n+\t\t\t * Do not touch the colour space for raw requested roles.\n+\t\t\t * Even if the pixel format is non-raw (whatever it means), we\n+\t\t\t * shouldn't try to interpret the colour space of raw data.\n+\t\t\t */\n+\t\t\tif (cfg.colorSpace && cfg.colorSpace != ColorSpace::Raw)\n+\t\t\t\tcfg.colorSpace->adjust(pixelFormat);\n+\t\t\tstatus = Adjusted;\n+\t\t}\n+\t\tif (!cfg.colorSpace) {\n+\t\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat);\n+\t\t\tswitch (info.colourEncoding) {\n+\t\t\tcase PixelFormatInfo::ColourEncodingRGB:\n+\t\t\t\tcfg.colorSpace = ColorSpace::Srgb;\n+\t\t\t\tbreak;\n+\t\t\tcase libcamera::PixelFormatInfo::ColourEncodingYUV:\n+\t\t\t\tcfg.colorSpace = ColorSpace::Sycc;\n+\t\t\t\tbreak;\n+\t\t\tdefault:\n+\t\t\t\tcfg.colorSpace = ColorSpace::Raw;\n+\t\t\t}\n+\t\t\tcfg.colorSpace->adjust(pixelFormat);\n \t\t\tstatus = Adjusted;\n \t\t}\n \n@@ -1314,11 +1338,23 @@ SimplePipelineHandler::generateConfiguration(Camera *camera, Span<const StreamRo\n \t *\n \t * \\todo Implement a better way to pick the default format\n \t */\n-\tfor ([[maybe_unused]] StreamRole role : roles) {\n+\tfor (StreamRole role : roles) {\n \t\tStreamConfiguration cfg{ StreamFormats{ formats } };\n \t\tcfg.pixelFormat = formats.begin()->first;\n \t\tcfg.size = formats.begin()->second[0].max;\n \n+\t\tif (role == StreamRole::Raw) {\n+\t\t\t/* Enforce raw colour space for raw roles. */\n+\t\t\tcfg.colorSpace = ColorSpace::Raw;\n+\t\t} else if (data->swIsp_) {\n+\t\t\t/*\n+\t\t\t * This is what software ISP currently produces. It may be arguable\n+\t\t\t * whether this applies also when CCM is not used but even then it's\n+\t\t\t * still likely to be a reasonable setting.\n+\t\t\t */\n+\t\t\tcfg.colorSpace = ColorSpace::Srgb;\n+\t\t}\n+\n \t\tconfig->addConfiguration(cfg);\n \t}\n \n", "prefixes": [ "v9", "01/10" ] }