{"id":24944,"url":"https://patchwork.libcamera.org/api/1.1/patches/24944/?format=json","web_url":"https://patchwork.libcamera.org/patch/24944/","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":"<20251101193558.38279-9-mzamazal@redhat.com>","date":"2025-11-01T19:35:57","name":"[v14,8/8] libcamera: simple: Make raw streams working","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c7b27d8931d635beed268c81fb46abbb965f3888","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/24944/mbox/","series":[{"id":5550,"url":"https://patchwork.libcamera.org/api/1.1/series/5550/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5550","date":"2025-11-01T19:35:49","name":"Enable raw streams with software ISP","version":14,"mbox":"https://patchwork.libcamera.org/series/5550/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24944/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24944/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 A765ABDE4C\n\tfor ;\n\tSat, 1 Nov 2025 19:55:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EEE696086F;\n\tSat, 1 Nov 2025 20:55: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 561C1606D5\n\tfor ;\n\tSat, 1 Nov 2025 20:55:41 +0100 (CET)","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-376-HnfgdRmbMBOBjZkzwYgYaw-1;\n\tSat, 01 Nov 2025 15:36:58 -0400","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.17])\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 D1A981956070; Sat, 1 Nov 2025 19:36:31 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.26])\n\tby mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 288E21955BE3; Sat, 1 Nov 2025 19:36:28 +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=\"ZjYgo/RO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1762026940;\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=Heq1oQ5fPFAKfplqDvylgp/6mjn9KNOPAjyt2vEi6Q8=;\n\tb=ZjYgo/ROMhqnAL+VRuYOnxP+JQZ/ZH/Qfz4et6KEEh8ZDQUyVaXSsggcL7K24lSU1GhYdM\n\tJ2JDfsnTrBvMM3OOABlqKBhE1Owl+KAzwyusM78h4c0dSemGCqfa8XfO+Mr76dvZ2tt8J4\n\trzHZgYyd6HjdIW3TQhBd8uaSClzJ90U=","X-MC-Unique":"HnfgdRmbMBOBjZkzwYgYaw-1","X-Mimecast-MFC-AGG-ID":"HnfgdRmbMBOBjZkzwYgYaw_1762025791","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 v14 8/8] libcamera: simple: Make raw streams working","Date":"Sat, 1 Nov 2025 20:35:57 +0100","Message-ID":"<20251101193558.38279-9-mzamazal@redhat.com>","In-Reply-To":"<20251101193558.38279-1-mzamazal@redhat.com>","References":"<20251101193558.38279-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"J044qFLCScgFd7s0m0Upu2US15qeLFd2G9Z3uebGNbA_1762025791","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 a raw stream is requested, whether alone or together with a\nprocessed stream, its buffers must be handled outside the software ISP\nmachinery. They serve as output buffers, even when a processed stream\nis produced.\n\nAt most one raw stream and at most one processed stream are supported\nand can be combined. An example of producing both raw and processed\nfiles using `cam' application:\n\n cam -c1 -C100 -Ffile# \\\n -s role=viewfinder,width=1920,height=1080,pixelformat=RGB888 \\\n -s role=raw,width=3280,height=2464,pixelformat=SRGGB8 \\\n\nNote the difference in viewfinder and raw stream sizes due to the fact\nthat debayering requires enlarging the image width, which enforces\nselecting a larger sensor resolution in this case.\n\nIn order to track whether a raw stream is requested and which one it is,\nSimpleCameraData::rawStream_ member variable is introduced.\n\nThis is the final step to make raw streams working.\n\nSigned-off-by: Milan Zamazal \n---\n src/libcamera/pipeline/simple/simple.cpp | 41 +++++++++++++++++-------\n 1 file changed, 29 insertions(+), 12 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 4c09d1e45..584f242e8 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -333,6 +333,7 @@ public:\n \t};\n \n \tstd::vector streams_;\n+\tStream *rawStream_;\n \n \t/*\n \t * All entities in the pipeline, from the camera sensor to the video\n@@ -467,7 +468,7 @@ private:\n SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n \t\t\t\t unsigned int numStreams,\n \t\t\t\t MediaEntity *sensor)\n-\t: Camera::Private(pipe), streams_(numStreams)\n+\t: Camera::Private(pipe), streams_(numStreams), rawStream_(nullptr)\n {\n \t/*\n \t * Find the shortest path from the camera sensor to a video capture\n@@ -878,10 +879,13 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t * point converting an erroneous buffer.\n \t */\n \tif (buffer->metadata().status != FrameMetadata::FrameSuccess) {\n-\t\tif (!useConversion_) {\n+\t\tif (rawStream_) {\n \t\t\t/* No conversion, just complete the request. */\n \t\t\tRequest *request = buffer->request();\n \t\t\tpipe->completeBuffer(request, buffer);\n+\t\t\tSimpleFrameInfo *info = frameInfo_.find(request->sequence());\n+\t\t\tif (info)\n+\t\t\t\tinfo->metadataRequired = false;\n \t\t\ttryCompleteRequest(request);\n \t\t\treturn;\n \t\t}\n@@ -940,7 +944,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t */\n \tif (useConversion_) {\n \t\tif (conversionQueue_.empty()) {\n-\t\t\tvideo_->queueBuffer(buffer);\n+\t\t\tif (!rawStream_)\n+\t\t\t\tvideo_->queueBuffer(buffer);\n \t\t\treturn;\n \t\t}\n \n@@ -956,6 +961,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t\t\t\t\t conversionQueue_.front().outputs);\n \n \t\tconversionQueue_.pop();\n+\t\tif (rawStream_)\n+\t\t\tpipe->completeBuffer(request, buffer);\n \t\treturn;\n \t}\n \n@@ -993,7 +1000,8 @@ void SimpleCameraData::tryCompleteRequest(Request *request)\n void SimpleCameraData::conversionInputDone(FrameBuffer *buffer)\n {\n \t/* Queue the input buffer back for capture. */\n-\tvideo_->queueBuffer(buffer);\n+\tif (!rawStream_)\n+\t\tvideo_->queueBuffer(buffer);\n }\n \n void SimpleCameraData::conversionOutputDone(FrameBuffer *buffer)\n@@ -1517,13 +1525,18 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \tstd::vector> outputCfgs;\n \tdata->useConversion_ = config->needConversion();\n \n+\tdata->rawStream_ = nullptr;\n \tfor (unsigned int i = 0; i < config->size(); ++i) {\n \t\tStreamConfiguration &cfg = config->at(i);\n+\t\tbool rawStream = isRaw(cfg);\n \n \t\tcfg.setStream(&data->streams_[i]);\n \n-\t\tif (data->useConversion_ && !isRaw(cfg))\n+\t\tif (data->useConversion_ && !rawStream)\n \t\t\toutputCfgs.push_back(cfg);\n+\n+\t\tif (rawStream)\n+\t\t\tdata->rawStream_ = &data->streams_[i];\n \t}\n \n \tif (outputCfgs.empty())\n@@ -1554,7 +1567,7 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream,\n \t * Export buffers on the converter or capture video node, depending on\n \t * whether the converter is used or not.\n \t */\n-\tif (data->useConversion_)\n+\tif (data->useConversion_ && stream != data->rawStream_)\n \t\treturn data->converter_\n \t\t\t ? data->converter_->exportBuffers(stream, count, buffers)\n \t\t\t : data->swIsp_->exportBuffers(stream, count, buffers);\n@@ -1577,7 +1590,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\treturn -EBUSY;\n \t}\n \n-\tif (data->useConversion_) {\n+\tif (data->useConversion_ && !data->rawStream_) {\n \t\t/*\n \t\t * When using the converter allocate a fixed number of internal\n \t\t * buffers.\n@@ -1585,8 +1598,11 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\tret = video->allocateBuffers(kNumInternalBuffers,\n \t\t\t\t\t &data->conversionBuffers_);\n \t} else {\n-\t\t/* Otherwise, prepare for using buffers from the only stream. */\n-\t\tStream *stream = &data->streams_[0];\n+\t\t/*\n+\t\t * Otherwise, prepare for using buffers from either the raw stream, if\n+\t\t * requested, or the only stream configured.\n+\t\t */\n+\t\tStream *stream = (data->rawStream_ ? data->rawStream_ : &data->streams_[0]);\n \t\tret = video->importBuffers(stream->configuration().bufferCount);\n \t}\n \tif (ret < 0) {\n@@ -1627,8 +1643,9 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\t}\n \n \t\t/* Queue all internal buffers for capture. */\n-\t\tfor (std::unique_ptr &buffer : data->conversionBuffers_)\n-\t\t\tvideo->queueBuffer(buffer.get());\n+\t\tif (!data->rawStream_)\n+\t\t\tfor (std::unique_ptr &buffer : data->conversionBuffers_)\n+\t\t\t\tvideo->queueBuffer(buffer.get());\n \t}\n \n \treturn 0;\n@@ -1679,7 +1696,7 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n \t\t * queue, it will be handed to the converter in the capture\n \t\t * completion handler.\n \t\t */\n-\t\tif (data->useConversion_) {\n+\t\tif (data->useConversion_ && stream != data->rawStream_) {\n \t\t\tbuffers.emplace(stream, buffer);\n \t\t\tmetadataRequired = !!data->swIsp_;\n \t\t} else {\n","prefixes":["v14","8/8"]}