{"id":23149,"url":"https://patchwork.libcamera.org/api/patches/23149/?format=json","web_url":"https://patchwork.libcamera.org/patch/23149/","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":"<20250407085639.16180-8-mzamazal@redhat.com>","date":"2025-04-07T08:56:33","name":"[v4,07/11] libcamera: simple: Consider raw output configurations","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"92142c8187bd1529bb4e9f367d5153da1cfd81db","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/23149/mbox/","series":[{"id":5117,"url":"https://patchwork.libcamera.org/api/series/5117/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5117","date":"2025-04-07T08:56:26","name":"Enable raw streams with software ISP","version":4,"mbox":"https://patchwork.libcamera.org/series/5117/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23149/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23149/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 F13A8C327D\n\tfor ;\n\tMon, 7 Apr 2025 08:57:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 40A1F68AA2;\n\tMon, 7 Apr 2025 10:57:24 +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 8A65168A38\n\tfor ;\n\tMon, 7 Apr 2025 10:57:19 +0200 (CEST)","from mx-prod-mc-05.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-35-z_xgi4BtNuitPtN6YCjN3g-1;\n\tMon, 07 Apr 2025 04:57:14 -0400","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.111])\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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 160321956080; Mon, 7 Apr 2025 08:57:13 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.224.129])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 3F40D180176A; Mon, 7 Apr 2025 08:57:10 +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=\"iMheN1d3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1744016238;\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=sBiwVCtgCTIevGTo3qi7ilO14tzDFZqNESeGhEi7BLc=;\n\tb=iMheN1d3RqO2BMKd18h+QdETkGip7MTHZTbfY41UMR1+tYKgH4jpm+0COs/gkf2i/ClJjQ\n\tHORs+X6s3gaV5PKW086L5ib/Mz7Gltyjtm2kQI1OKWIK65RVp7ThKReqqcPHF0OMSQ9tGM\n\t+wEqY68qoRLIFUGuK2x3iCYvpUKVYNU=","X-MC-Unique":"z_xgi4BtNuitPtN6YCjN3g-1","X-Mimecast-MFC-AGG-ID":"z_xgi4BtNuitPtN6YCjN3g_1744016233","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tLaurent Pinchart ,\n\tKieran Bingham ","Subject":"[PATCH v4 07/11] libcamera: simple: Consider raw output\n\tconfigurations","Date":"Mon, 7 Apr 2025 10:56:33 +0200","Message-ID":"<20250407085639.16180-8-mzamazal@redhat.com>","In-Reply-To":"<20250407085639.16180-1-mzamazal@redhat.com>","References":"<20250407085639.16180-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"D0hXxZdBrsLc7LZKlfHP2luaJDh_TotzVpoZTG7QmaQ_1744016233","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 | 73 ++++++++++++++++--------\n 1 file changed, 48 insertions(+), 25 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex bf9d75f4..6b65d79f 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -439,6 +439,8 @@ private:\n \tconst MediaPad *acquirePipeline(SimpleCameraData *data);\n \tvoid releasePipeline(SimpleCameraData *data);\n \n+\tvoid setUpFormatSizes(std::map> &formats);\n+\n \tstd::map entities_;\n \n \tMediaDevice *converter_;\n@@ -1321,35 +1323,28 @@ 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 \tfor (const SimpleCameraData::Configuration &cfg : data->configs_)\n-\t\tif (!cfg.raw)\n-\t\t\tfor (PixelFormat format : cfg.outputFormats)\n-\t\t\t\tformats[format].push_back(cfg.outputSizes);\n+\t\tfor (PixelFormat format : cfg.outputFormats)\n+\t\t\t(cfg.raw ? rawFormats : processedFormats)[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-\n-\t\tsizes.erase(++cur, sizes.end());\n+\tif (data->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 (data->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+\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@@ -1357,11 +1352,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\tcfg.colorSpace = ColorSpace::Raw;\n \t\telse if (data->swIsp_)\n \t\t\tcfg.colorSpace = ColorSpace::Srgb;\n@@ -1374,6 +1371,32 @@ SimplePipelineHandler::generateConfiguration(Camera *camera, Span> &formats)\n+{\n+\t/* Sort the sizes and merge any consecutive overlapping ranges. */\n+\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+\t}\n+}\n+\n int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n {\n \tSimpleCameraConfiguration *config =\n","prefixes":["v4","07/11"]}