{"id":24050,"url":"https://patchwork.libcamera.org/api/1.1/patches/24050/?format=json","web_url":"https://patchwork.libcamera.org/patch/24050/","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":"<20250804163812.126022-4-mzamazal@redhat.com>","date":"2025-08-04T16:38:06","name":"[v12,3/8] libcamera: simple: Handle processed and raw formats separately","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"240ab8eba648a9c8e79599f7ca46a9eba665edd2","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24050/mbox/","series":[{"id":5355,"url":"https://patchwork.libcamera.org/api/1.1/series/5355/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5355","date":"2025-08-04T16:38:03","name":"Enable raw streams with software ISP","version":12,"mbox":"https://patchwork.libcamera.org/series/5355/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24050/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24050/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 2597CBDCC1\n\tfor ;\n\tMon, 4 Aug 2025 16:38:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D15DF6921D;\n\tMon, 4 Aug 2025 18:38:40 +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 D908C69222\n\tfor ;\n\tMon, 4 Aug 2025 18:38:38 +0200 (CEST)","from mx-prod-mc-02.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-294-lxhA4xuFPhyYYit0Lpm1ow-1;\n\tMon, 04 Aug 2025 12:38:36 -0400","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.93])\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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id E0A601936D82; Mon, 4 Aug 2025 16:38:34 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.17])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 9A2771800EF0; Mon, 4 Aug 2025 16:38:32 +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=\"TY3LxD1C\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1754325517;\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=t2eAK69fV8Rhan1y/6XqS9mKSQ3cDd64kJTWrZsD6Kw=;\n\tb=TY3LxD1CD9n1tz+/Mesly5tG2rbzIBV44A+iT5x4RZMCYy8QH9IIsSLeeVNl2PbKUwY1Y7\n\tDQUYaVzhveSM4Uu6A/CGIQBR4qyT8bFtAeffsTeGyFXtpeVDdF+vyilbuN9ZRptJoEETCC\n\t3AH68ugHl5JAmWmIeftycGcDMoXMttI=","X-MC-Unique":"lxhA4xuFPhyYYit0Lpm1ow-1","X-Mimecast-MFC-AGG-ID":"lxhA4xuFPhyYYit0Lpm1ow_1754325515","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 v12 3/8] libcamera: simple: Handle processed and raw formats\n\tseparately","Date":"Mon, 4 Aug 2025 18:38:06 +0200","Message-ID":"<20250804163812.126022-4-mzamazal@redhat.com>","In-Reply-To":"<20250804163812.126022-1-mzamazal@redhat.com>","References":"<20250804163812.126022-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"gjnNsilODTBP4KiRWubttVKFcUk72wOQ7mEStcXCgSA_1754325515","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":"Let's handle both processed and/or raw output configurations. In\naddition to the already handled processed formats and sizes, this patch\nadds handling of raw formats and sizes, which correspond to the capture\nformats and sizes.\n\nWhen creating stream configurations, raw or processed formats are\nselected according to the requested stream roles.\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 | 79 +++++++++++++++++-------\n 1 file changed, 56 insertions(+), 23 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 5fba94170..bc4d7bd41 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -1322,42 +1322,75 @@ SimplePipelineHandler::generateConfiguration(Camera *camera, Span> formats;\n+\tbool processedRequested = false;\n+\tbool rawRequested = false;\n+\tfor (const auto &role : roles)\n+\t\tif (role == StreamRole::Raw) {\n+\t\t\tif (rawRequested) {\n+\t\t\t\tLOG(SimplePipeline, Error)\n+\t\t\t\t\t<< \"Can't capture multiple raw streams\";\n+\t\t\t\treturn nullptr;\n+\t\t\t}\n+\t\t\trawRequested = true;\n+\t\t} else {\n+\t\t\tprocessedRequested = true;\n+\t\t}\n+\n+\t/* Create the formats maps. */\n+\tstd::map> processedFormats;\n+\tstd::map> rawFormats;\n \n \tfor (const SimpleCameraData::Configuration &cfg : data->configs_) {\n+\t\trawFormats[cfg.captureFormat].push_back(cfg.captureSize);\n \t\tfor (PixelFormat format : cfg.outputFormats)\n-\t\t\tformats[format].push_back(cfg.outputSizes);\n+\t\t\tprocessedFormats[format].push_back(cfg.outputSizes);\n \t}\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-\n-\t\tsizes.erase(++cur, sizes.end());\n+\tif (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 (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 \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\tconst auto &formats = (role == StreamRole::Raw ? rawFormats : processedFormats);\n \t\tStreamConfiguration cfg{ StreamFormats{ formats } };\n \t\tcfg.pixelFormat = formats.begin()->first;\n \t\tcfg.size = formats.begin()->second[0].max;\n","prefixes":["v12","3/8"]}