{"id":23406,"url":"https://patchwork.libcamera.org/api/patches/23406/?format=json","web_url":"https://patchwork.libcamera.org/patch/23406/","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":"<20250520123158.44237-13-mzamazal@redhat.com>","date":"2025-05-20T12:31:57","name":"[v5,12/12] libcamera: simple: Make raw streams working","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"808f359a64f599a9598ab2234c38b822a1c96153","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/23406/mbox/","series":[{"id":5184,"url":"https://patchwork.libcamera.org/api/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/23406/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23406/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 18C47C31E9\n\tfor ;\n\tTue, 20 May 2025 12:32:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D5CBD68D8A;\n\tTue, 20 May 2025 14:32:57 +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 9144E68D76\n\tfor ;\n\tTue, 20 May 2025 14:32:45 +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-241-VxkpvW41Phe3MgXd6Z4o2g-1;\n\tTue, 20 May 2025 08:32:40 -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 C4F58180035C; Tue, 20 May 2025 12:32:39 +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 8E85119560A3; Tue, 20 May 2025 12:32:37 +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=\"d9QTSly8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1747744364;\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=Pl9WGW8nrLpYUHMTAoBouV+H0TdlcdhjgjSP2ltaUvA=;\n\tb=d9QTSly8zOacgL/UvTlH1KMs8yCvC2U9Q9fAdFwWoI7mq3TC+6NDK+k4/vwZD7l4jfeSCE\n\tz9RFwOh/iODo+e3ShAqJ5CwJaPqHG/QUVw6AR9Ay5NUg/h1zph4hRlnL31bleW6eLoWT49\n\taTbN+8qkgOmRF8E2qPfM967TGCWOIuU=","X-MC-Unique":"VxkpvW41Phe3MgXd6Z4o2g-1","X-Mimecast-MFC-AGG-ID":"VxkpvW41Phe3MgXd6Z4o2g_1747744359","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 12/12] libcamera: simple: Make raw streams working","Date":"Tue, 20 May 2025 14:31:57 +0200","Message-ID":"<20250520123158.44237-13-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":"Ai4uVBXVrWlXKEAXDWv8LEAx0SMvkAzbWkOYUvfRvfs_1747744359","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 distinguish between different cases, processedRequested_ and\nrawRequested_ flags are copied from SimpleCameraConfiguration to\nSimpleCameraData after successful configure(), similarly to\nuseConversion_ flag.\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 | 35 ++++++++++++++++--------\n 1 file changed, 24 insertions(+), 11 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 392f8655..85518574 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -346,6 +346,8 @@ public:\n \t};\n \tstd::queue conversionQueue_;\n \tbool useConversion_;\n+\tbool processedRequested_;\n+\tbool rawRequested_;\n \n \tstd::unique_ptr converter_;\n \tstd::unique_ptr swIsp_;\n@@ -871,10 +873,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 (rawRequested_) {\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@@ -884,7 +889,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t\t * buffer for capture (unless the stream is being stopped), and\n \t\t * complete the request with all the user-facing buffers.\n \t\t */\n-\t\tif (buffer->metadata().status != FrameMetadata::FrameCancelled)\n+\t\tif (buffer->metadata().status != FrameMetadata::FrameCancelled &&\n+\t\t !rawRequested_)\n \t\t\tvideo_->queueBuffer(buffer);\n \n \t\tif (conversionQueue_.empty())\n@@ -933,13 +939,14 @@ 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 (!rawRequested_)\n+\t\t\t\tvideo_->queueBuffer(buffer);\n \t\t\treturn;\n \t\t}\n \n \t\tif (converter_)\n \t\t\tconverter_->queueBuffers(buffer, conversionQueue_.front().outputs);\n-\t\telse\n+\t\telse if (processedRequested_)\n \t\t\t/*\n \t\t\t * request->sequence() cannot be retrieved from `buffer' inside\n \t\t\t * queueBuffers because unique_ptr's make buffer->request() invalid\n@@ -949,6 +956,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t\t\t\t\t conversionQueue_.front().outputs);\n \n \t\tconversionQueue_.pop();\n+\t\tif (rawRequested_)\n+\t\t\tpipe->completeBuffer(request, buffer);\n \t\treturn;\n \t}\n \n@@ -986,7 +995,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 (!rawRequested_)\n+\t\tvideo_->queueBuffer(buffer);\n }\n \n void SimpleCameraData::conversionOutputDone(FrameBuffer *buffer)\n@@ -1493,6 +1503,8 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n \t/* Configure the converter if needed. */\n \tstd::vector> outputCfgs;\n \tdata->useConversion_ = config->needConversion();\n+\tdata->processedRequested_ = config->processedRequested_;\n+\tdata->rawRequested_ = config->rawRequested_;\n \n \tfor (unsigned int i = 0; i < config->size(); ++i) {\n \t\tStreamConfiguration &cfg = config->at(i);\n@@ -1531,7 +1543,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_ && !data->rawRequested_)\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@@ -1554,7 +1566,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->rawRequested_) {\n \t\t/*\n \t\t * When using the converter allocate a fixed number of internal\n \t\t * buffers.\n@@ -1562,7 +1574,7 @@ 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\t/* Otherwise, prepare for using buffers from the only or raw stream. */\n \t\tStream *stream = &data->streams_[0];\n \t\tret = video->importBuffers(stream->configuration().bufferCount);\n \t}\n@@ -1604,8 +1616,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->rawRequested_)\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@@ -1656,7 +1669,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_ && !isFormatRaw(stream->configuration().pixelFormat)) {\n \t\t\tbuffers.emplace(stream, buffer);\n \t\t\tmetadataRequired = !!data->swIsp_;\n \t\t} else {\n","prefixes":["v5","12/12"]}