{"id":23765,"url":"https://patchwork.libcamera.org/api/patches/23765/?format=json","web_url":"https://patchwork.libcamera.org/patch/23765/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20250707155856.33436-7-mzamazal@redhat.com>","date":"2025-07-07T15:58:51","name":"[v9,06/10] libcamera: simple: Consider raw output configurations","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"64f78e29bea822a8973fb6e8ea8b81a96f6a8019","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23765/mbox/","series":[{"id":5274,"url":"https://patchwork.libcamera.org/api/series/5274/?format=json","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/23765/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23765/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 6EB41C3237\n\tfor ;\n\tMon, 7 Jul 2025 15:59:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3063668ECB;\n\tMon, 7 Jul 2025 17:59:29 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B26BD68EC3\n\tfor ;\n\tMon, 7 Jul 2025 17:59:27 +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-437-h57Ik232NC2jQhsLxdN_2Q-1;\n\tMon, 07 Jul 2025 11:59:25 -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 132DA19560A6; Mon, 7 Jul 2025 15:59:23 +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 7E82E19560AB; Mon, 7 Jul 2025 15:59:20 +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=\"iTHXsbXP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1751903966;\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=1PjdueQBrDfnTJomz/GbTKagvIwesOLmmebne9AABo4=;\n\tb=iTHXsbXPY8DqCkCR/BEWhjiPSu8yRl9kv2VJShhAVaw7wa3Yb9rRZBlxQfXNNkIJKptisn\n\tTdcuzFdT9Wz5Mg3YMuxQTtFcwdziVD9XGQB5PFpCAD38Ql3ZMVvP1rcvEq2luCW7zb/nZB\n\t9cly4A/TJAEcedlq6g2zv4JtuTmr/js=","X-MC-Unique":"h57Ik232NC2jQhsLxdN_2Q-1","X-Mimecast-MFC-AGG-ID":"h57Ik232NC2jQhsLxdN_2Q_1751903964","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Laurent Pinchart\n\t, Kieran Bingham\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t, Paul Elder\n\t, Umang Jain ","Subject":"[PATCH v9 06/10] libcamera: simple: Consider raw output\n\tconfigurations","Date":"Mon, 7 Jul 2025 17:58:51 +0200","Message-ID":"<20250707155856.33436-7-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":"DCd8jQN02O7c8tcFmD6YMzgLzPsQo8XQIMdqkbwH0NE_1751903964","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":"","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":"When generating simple pipeline configuration, raw output configurations\nare generated but later filtered out. Let's include processed and/or\nraw output configurations depending on the requested stream roles.\n\nRaw and processed formats are handled separately. The intention is that\nin case both raw and processed formats are requested then the raw\nformats should be left intact to the extent possible and not be\ninfluenced by the processed formats (implying that raw parameters\ncompatible with the processed output requirements must be requested by\nthe application).\n\nRaw output configurations are identified by colorSpace being set to\nColorSpace::Raw.\n\nThis is another preparatory patch without making raw outputs working.\n\nSigned-off-by: Milan Zamazal \n---\n src/libcamera/pipeline/simple/simple.cpp | 71 ++++++++++++++----------\n 1 file changed, 43 insertions(+), 28 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 6330afeb5..27425e867 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -1335,38 +1335,51 @@ SimplePipelineHandler::generateConfiguration(Camera *camera, SpanprocessedRequested_ = true;\n \t\t}\n \n-\t/* Create the formats map. */\n-\tstd::map> formats;\n+\t/* Create the formats maps. */\n+\tstd::map> processedFormats;\n+\tstd::map> rawFormats;\n \n-\tconst bool rawOnly = std::all_of(data->configs_.cbegin(),\n-\t\t\t\t\t data->configs_.cend(),\n-\t\t\t\t\t [](const auto &c) { return c.raw; });\n \tfor (const SimpleCameraData::Configuration &cfg : data->configs_)\n-\t\tif (!cfg.raw || rawOnly)\n-\t\t\tfor (PixelFormat format : cfg.outputFormats)\n-\t\t\t\tformats[format].push_back(cfg.outputSizes);\n-\n-\t/* Sort the sizes and merge any consecutive overlapping ranges. */\n-\tfor (auto &[format, sizes] : formats) {\n-\t\tstd::sort(sizes.begin(), sizes.end(),\n-\t\t\t [](SizeRange &a, SizeRange &b) {\n-\t\t\t\t return a.min < b.min;\n-\t\t\t });\n-\n-\t\tauto cur = sizes.begin();\n-\t\tauto next = cur;\n-\n-\t\twhile (++next != sizes.end()) {\n-\t\t\tif (cur->max.width >= next->min.width &&\n-\t\t\t cur->max.height >= next->min.height)\n-\t\t\t\tcur->max = next->max;\n-\t\t\telse if (++cur != next)\n-\t\t\t\t*cur = *next;\n-\t\t}\n+\t\tfor (PixelFormat format : cfg.outputFormats)\n+\t\t\t(cfg.raw ? rawFormats : processedFormats)[format].push_back(cfg.outputSizes);\n \n-\t\tsizes.erase(++cur, sizes.end());\n+\tif (config->processedRequested_ && processedFormats.empty()) {\n+\t\tLOG(SimplePipeline, Error)\n+\t\t\t<< \"Processed stream requsted but no corresponding output configuration found\";\n+\t\treturn nullptr;\n+\t}\n+\tif (config->rawRequested_ && rawFormats.empty()) {\n+\t\tLOG(SimplePipeline, Error)\n+\t\t\t<< \"Raw stream requsted but no corresponding output configuration found\";\n+\t\treturn nullptr;\n \t}\n \n+\tauto setUpFormatSizes = [](std::map> &formats) {\n+\t\t/* Sort the sizes and merge any consecutive overlapping ranges. */\n+\n+\t\tfor (auto &[format, sizes] : formats) {\n+\t\t\tstd::sort(sizes.begin(), sizes.end(),\n+\t\t\t\t [](SizeRange &a, SizeRange &b) {\n+\t\t\t\t\t return a.min < b.min;\n+\t\t\t\t });\n+\n+\t\t\tauto cur = sizes.begin();\n+\t\t\tauto next = cur;\n+\n+\t\t\twhile (++next != sizes.end()) {\n+\t\t\t\tif (cur->max.width >= next->min.width &&\n+\t\t\t\t cur->max.height >= next->min.height)\n+\t\t\t\t\tcur->max = next->max;\n+\t\t\t\telse if (++cur != next)\n+\t\t\t\t\t*cur = *next;\n+\t\t\t}\n+\n+\t\t\tsizes.erase(++cur, sizes.end());\n+\t\t}\n+\t};\n+\tsetUpFormatSizes(processedFormats);\n+\tsetUpFormatSizes(rawFormats);\n+\n \t/*\n \t * Create the stream configurations. Take the first entry in the formats\n \t * map as the default, for lack of a better option.\n@@ -1374,11 +1387,13 @@ SimplePipelineHandler::generateConfiguration(Camera *camera, Spanfirst;\n \t\tcfg.size = formats.begin()->second[0].max;\n \n-\t\tif (role == StreamRole::Raw) {\n+\t\tif (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","prefixes":["v9","06/10"]}