{"id":23400,"url":"https://patchwork.libcamera.org/api/1.1/patches/23400/?format=json","web_url":"https://patchwork.libcamera.org/patch/23400/","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":"<20250520123158.44237-7-mzamazal@redhat.com>","date":"2025-05-20T12:31:51","name":"[v5,06/12] libcamera: simple: Add plain output configurations","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5087409ada6e0003e6855f0485a6b1a595aa7d9a","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/23400/mbox/","series":[{"id":5184,"url":"https://patchwork.libcamera.org/api/1.1/series/5184/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5184","date":"2025-05-20T12:31:45","name":"Enable raw streams with software ISP","version":5,"mbox":"https://patchwork.libcamera.org/series/5184/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23400/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23400/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 776F7C31E9\n\tfor ;\n\tTue, 20 May 2025 12:32:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EFB3B68D85;\n\tTue, 20 May 2025 14:32:40 +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 6E52E614DE\n\tfor ;\n\tTue, 20 May 2025 14:32:28 +0200 (CEST)","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-491-cUkRFjL4M52cJ2bGuwZKWQ-1;\n\tTue, 20 May 2025 08:32:24 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 037A0180087C; Tue, 20 May 2025 12:32:23 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.226.214])\n\tby mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id BC3E019560A3; Tue, 20 May 2025 12:32: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=\"SBddqGIg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1747744347;\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=DmNC+VlWSgD7t4gOEwbogOdqcocUasqwtbvJ3FNv6B8=;\n\tb=SBddqGIgqnNHZTASy8UOAXNotQ0/UtW3AlpMkMu83xy9otNNdZ9CzrUw/k4/5RUbMYR3fS\n\tya3P0TDx8swqpk+xDsFo+pR7JJv3ndyvr3tD+PV8PJF1xa/V/dK9Q5MecBIfEOnP5oncd4\n\tBRRQhGzdUl+pbtbQ7b/5JP6r16YwAbQ=","X-MC-Unique":"cUkRFjL4M52cJ2bGuwZKWQ-1","X-Mimecast-MFC-AGG-ID":"cUkRFjL4M52cJ2bGuwZKWQ_1747744343","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","Subject":"[PATCH v5 06/12] libcamera: simple: Add plain output configurations","Date":"Tue, 20 May 2025 14:31:51 +0200","Message-ID":"<20250520123158.44237-7-mzamazal@redhat.com>","In-Reply-To":"<20250520123158.44237-1-mzamazal@redhat.com>","References":"<20250520123158.44237-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":"CsvIn3U6dzt8D2zpVdypI2sAbUbV5D9bIBmtblQRkRE_1747744343","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":"Output configurations in simple pipeline are added depending on whether\na converter, software ISP or none of them are used. If a converter or\nsoftware ISP is used, no raw output configurations are added. Unless\nonly raw configurations are available, in which case we add them to\navoid ...\n\nIn order to support raw output at least with software ISP, let's always\nadd raw output configurations. A flag is added to\nSimpleCameraData::Configuration indicating whether it's for a raw or a\nconverted output. We later filter formats and output sizes for\nparticular stream configurations according to the new configuration\nflag.\n\nThis is just preparation and raw output is still not supported. At the\nmoment, we simply filter out raw configurations unconditionally to keep\nthe current code working; this will be changed in followup patches.\n\nSigned-off-by: Milan Zamazal \n---\n src/libcamera/pipeline/simple/simple.cpp | 34 +++++++++++++++---------\n 1 file changed, 22 insertions(+), 12 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 60b7e1b1..d0f44c7d 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -319,6 +319,7 @@ public:\n \t\tSize captureSize;\n \t\tstd::vector outputFormats;\n \t\tSizeRange outputSizes;\n+\t\tbool raw;\n \t};\n \n \tstd::vector streams_;\n@@ -708,27 +709,33 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size)\n \t\t\tcontinue;\n \n \t\tConfiguration config;\n+\n+\t\t/* Raw configuration */\n \t\tconfig.code = code;\n \t\tconfig.sensorSize = size;\n \t\tconfig.captureFormat = pixelFormat;\n \t\tconfig.captureSize = format.size;\n+\t\tconfig.outputFormats = { pixelFormat };\n+\t\tconfig.outputSizes = config.captureSize;\n+\t\tconfig.raw = true;\n+\t\tconfigs_.push_back(config);\n \n+\t\t/* Modified, non-raw, configuration */\n+\t\tconfig.raw = false;\n \t\tif (converter_) {\n \t\t\tconfig.outputFormats = converter_->formats(pixelFormat);\n \t\t\tconfig.outputSizes = converter_->sizes(format.size);\n \t\t} else if (swIsp_) {\n-\t\t\tconfig.outputFormats = swIsp_->formats(pixelFormat);\n-\t\t\tconfig.outputSizes = swIsp_->sizes(pixelFormat, format.size);\n-\t\t\tif (config.outputFormats.empty()) {\n+\t\t\tstd::vector outputFormats = swIsp_->formats(pixelFormat);\n+\t\t\tif (outputFormats.empty()) {\n \t\t\t\t/* Do not use swIsp for unsupported pixelFormat's. */\n-\t\t\t\tconfig.outputFormats = { pixelFormat };\n-\t\t\t\tconfig.outputSizes = config.captureSize;\n+\t\t\t\tcontinue;\n \t\t\t}\n+\t\t\tconfig.outputFormats = outputFormats;\n+\t\t\tconfig.outputSizes = swIsp_->sizes(pixelFormat, format.size);\n \t\t} else {\n-\t\t\tconfig.outputFormats = { pixelFormat };\n-\t\t\tconfig.outputSizes = config.captureSize;\n+\t\t\tcontinue;\n \t\t}\n-\n \t\tconfigs_.push_back(config);\n \t}\n }\n@@ -1301,10 +1308,13 @@ SimplePipelineHandler::generateConfiguration(Camera *camera, Span> formats;\n \n-\tfor (const SimpleCameraData::Configuration &cfg : data->configs_) {\n-\t\tfor (PixelFormat format : cfg.outputFormats)\n-\t\t\tformats[format].push_back(cfg.outputSizes);\n-\t}\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","prefixes":["v5","06/12"]}