Patch Detail
Show a patch.
GET /api/patches/22649/?format=api
{ "id": 22649, "url": "https://patchwork.libcamera.org/api/patches/22649/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22649/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20250124215806.158024-11-mzamazal@redhat.com>", "date": "2025-01-24T21:58:01", "name": "[RFC,v2,10/13] libcamera: simple: Make raw streams working", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a7ac13e999b3ad49ad5fee6d3b86bae0c9d4dc11", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22649/mbox/", "series": [ { "id": 4970, "url": "https://patchwork.libcamera.org/api/series/4970/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4970", "date": "2025-01-24T21:57:51", "name": "Enable raw streams with software ISP", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4970/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22649/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22649/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 6410CC3318\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 24 Jan 2025 21:58:55 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 90D5168574;\n\tFri, 24 Jan 2025 22:58:54 +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 61E4B68566\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 Jan 2025 22:58:47 +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-539-7Q6Pqx_6PE2orGeH4WCKJg-1;\n\tFri, 24 Jan 2025 16:58:45 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS\n\tid 4E49019560B0 for <libcamera-devel@lists.libcamera.org>;\n\tFri, 24 Jan 2025 21:58:44 +0000 (UTC)", "from mzamazal-thinkpadp1gen3.tpbc.com (unknown [10.39.192.49])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 0B2951800348; Fri, 24 Jan 2025 21:58:42 +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=\"EWBI36wF\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1737755926;\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=eByf0H1h1y8yWpRpZaZ3V/+eufydfV6gXozyz6269h4=;\n\tb=EWBI36wFDFdV9bT7hY2Xotw82j2RLVarMCsuPMhcQXyPJtYcA7Om+yWbLaxJaMxfW832/r\n\tccA8YV8ApoRe6yabQDAtjgQA+3or/K/fPhvCuLVlsityPA5qVkxjxtCbp19UNVq74UXFgi\n\t7UVHbaRABmWfZMaCLqDWrn5MdZQeZF0=", "X-MC-Unique": "7Q6Pqx_6PE2orGeH4WCKJg-1", "X-Mimecast-MFC-AGG-ID": "7Q6Pqx_6PE2orGeH4WCKJg", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>", "Subject": "[RFC PATCH v2 10/13] libcamera: simple: Make raw streams working", "Date": "Fri, 24 Jan 2025 22:58:01 +0100", "Message-ID": "<20250124215806.158024-11-mzamazal@redhat.com>", "In-Reply-To": "<20250124215806.158024-1-mzamazal@redhat.com>", "References": "<20250124215806.158024-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": "MMW8pWA3VwwNif1Ejwb41b1qIkiZ7ZyykdMv35j5ww0_1737755924", "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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 input buffers, even when a processed stream is\nproduced.\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 -s role=raw,width=1920,height=1080,pixelformat=SRGGB8 -s role=viewfinder,width=1920,height=1080,pixelformat=RGB888 -Ffile#\n\nThis is the final step to make raw streams working.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/libcamera/pipeline/simple/simple.cpp | 24 +++++++++++++++---------\n 1 file changed, 15 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex edf08666..23456cbf 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -824,7 +824,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@@ -870,13 +871,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 (swispRequested_)\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@@ -886,6 +888,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@@ -905,7 +909,8 @@ void SimpleCameraData::clearIncompleteRequests()\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@@ -1450,7 +1455,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@@ -1458,7 +1463,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@@ -1489,8 +1494,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<FrameBuffer> &buffer : data->conversionBuffers_)\n-\t\t\tvideo->queueBuffer(buffer.get());\n+\t\tif (!data->rawRequested_)\n+\t\t\tfor (std::unique_ptr<FrameBuffer> &buffer : data->conversionBuffers_)\n+\t\t\t\tvideo->queueBuffer(buffer.get());\n \t}\n \n \treturn 0;\n@@ -1532,7 +1538,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_ && !isRawFormat(stream->configuration().pixelFormat)) {\n \t\t\tbuffers.emplace(stream, buffer);\n \t\t} else {\n \t\t\tret = data->video_->queueBuffer(buffer);\n", "prefixes": [ "RFC", "v2", "10/13" ] }