{"id":22933,"url":"https://patchwork.libcamera.org/api/1.1/patches/22933/?format=json","web_url":"https://patchwork.libcamera.org/patch/22933/","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":"<20250305192617.18361-4-mzamazal@redhat.com>","date":"2025-03-05T19:26:10","name":"[v3,3/8] libcamera: simple: Add plain output configurations","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6d55d370c1db70e5700c311078bf83f45263a74c","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/22933/mbox/","series":[{"id":5047,"url":"https://patchwork.libcamera.org/api/1.1/series/5047/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5047","date":"2025-03-05T19:26:07","name":"Enable raw streams with software ISP","version":3,"mbox":"https://patchwork.libcamera.org/series/5047/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22933/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22933/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 D0AEEC0F1B\n\tfor ;\n\tWed, 5 Mar 2025 19:26:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 91C5C6888A;\n\tWed, 5 Mar 2025 20:26:42 +0100 (CET)","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 5E105687DD\n\tfor ;\n\tWed, 5 Mar 2025 20:26:40 +0100 (CET)","from mx-prod-mc-03.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-287-d8IwSaC8M-eyvFCtX0N8sg-1;\n\tWed, 05 Mar 2025 14:26:34 -0500","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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 601761955BCC; Wed, 5 Mar 2025 19:26:33 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.87])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id E2EEF1800255; Wed, 5 Mar 2025 19:26:31 +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=\"cZlNpFMs\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1741202799;\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=8xavB+t1/eE69OcBO60jpOzoOfwp/dEbrHtAoTGzyqw=;\n\tb=cZlNpFMs/xtshS3MvSBSbWuxNm5RagUkSCK2d8FTRuSJeUljoN3kV2yunbyy8nttiv+65R\n\t9lLJ/CvU8eXqtYIsgvgm01zNG6PCYpSRJP9Q+d+rzTXRxe6PougjvwG2jgAHPBfW9MF5+J\n\tHK61YYmHq55ieG5MEckNwKQPAIPvrC8=","X-MC-Unique":"d8IwSaC8M-eyvFCtX0N8sg-1","X-Mimecast-MFC-AGG-ID":"d8IwSaC8M-eyvFCtX0N8sg_1741202793","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tLaurent Pinchart ","Subject":"[PATCH v3 3/8] libcamera: simple: Add plain output configurations","Date":"Wed, 5 Mar 2025 20:26:10 +0100","Message-ID":"<20250305192617.18361-4-mzamazal@redhat.com>","In-Reply-To":"<20250305192617.18361-1-mzamazal@redhat.com>","References":"<20250305192617.18361-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":"2vdbE4B3tbKav5bSYTki1kaO-Wm1KDxEs3sNUbGn4TY_1741202793","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.\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 | 31 +++++++++++++++---------\n 1 file changed, 19 insertions(+), 12 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 4af5926f..c805639c 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -273,6 +273,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@@ -636,27 +637,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@@ -1171,10 +1178,10 @@ 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+\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 \n \t/* Sort the sizes and merge any consecutive overlapping ranges. */\n \tfor (auto &[format, sizes] : formats) {\n","prefixes":["v3","3/8"]}