Patch Detail
Show a patch.
GET /api/1.1/patches/23499/?format=api
{ "id": 23499, "url": "https://patchwork.libcamera.org/api/1.1/patches/23499/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23499/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20250606164156.1442682-21-barnabas.pocze@ideasonboard.com>", "date": "2025-06-06T16:41:53", "name": "[RFC,v1,20/23] libcamera: pipeline: rpi: Queue metadata until completion", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "cce2203c32d470f29bc5a380da7438045f83689f", "submitter": { "id": 216, "url": "https://patchwork.libcamera.org/api/1.1/people/216/?format=api", "name": "Barnabás Pőcze", "email": "barnabas.pocze@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23499/mbox/", "series": [ { "id": 5210, "url": "https://patchwork.libcamera.org/api/1.1/series/5210/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5210", "date": "2025-06-06T16:41:33", "name": "libcamera: Add `MetadataList`", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5210/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23499/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23499/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 A3E11C332E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 6 Jun 2025 16:42:51 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1E19568DD2;\n\tFri, 6 Jun 2025 18:42:51 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 96C1C68DD3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Jun 2025 18:42:20 +0200 (CEST)", "from pb-laptop.local (185.182.215.79.nat.pool.zt.hu\n\t[185.182.215.79])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 224156DC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Jun 2025 18:42:16 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"pp3FBgoL\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1749228136;\n\tbh=v4haTZL+iX8qFxPedc94HVWa6Y3xwi6lSmxDSlZEqSQ=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=pp3FBgoLpfhjhH84HlnN0IIip6dIhlIxbUaOmTyENc70CBLS/iAa23Etk3eIwM1rU\n\t/OL5rFqM/yuMTwkteOCUXGgFU9c89O2zLjqo+halTydr+FlEtGchkfNJqu0b1k786m\n\tzpYQF9j1roZ0kpWquQJ13VOGolOFYYlsQ0dkJxFY=", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[RFC PATCH v1 20/23] libcamera: pipeline: rpi: Queue metadata until\n\tcompletion", "Date": "Fri, 6 Jun 2025 18:41:53 +0200", "Message-ID": "<20250606164156.1442682-21-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.49.0", "In-Reply-To": "<20250606164156.1442682-1-barnabas.pocze@ideasonboard.com>", "References": "<20250606164156.1442682-1-barnabas.pocze@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "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": "The rpi pipeline drops a certain number of initial frames. It uses\n`ControlList::clear()` to remove the metadata items of a request that\nwas populated while processing a frame that is ultimately dropped.\nSince the decision to drop a frame only occurs at the very end of the\nprocessing, this stop-gap measure is introduced to delay metadata\ncompletion until the request is actually completed.\n\nObsoleted by https://patchwork.libcamera.org/cover/23474/.\n\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n---\n .../pipeline/rpi/common/pipeline_base.cpp | 29 +++++++++++--------\n .../pipeline/rpi/common/pipeline_base.h | 4 +--\n src/libcamera/pipeline/rpi/pisp/pisp.cpp | 8 ++---\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 8 ++---\n 4 files changed, 27 insertions(+), 22 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 98507a152..d432cfb51 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -780,7 +780,7 @@ int PipelineHandlerBase::queueRequestDevice(Camera *camera, Request *request)\n \t}\n \n \t/* Push the request to the back of the queue. */\n-\tdata->requestQueue_.push(request);\n+\tdata->requestQueue_.push({ request, {} });\n \tdata->handleState();\n \n \treturn 0;\n@@ -1232,8 +1232,8 @@ void CameraData::metadataReady(const ControlList &metadata)\n \n \t/* Add to the Request metadata buffer what the IPA has provided. */\n \t/* Last thing to do is to fill up the request metadata. */\n-\tRequest *request = requestQueue_.front();\n-\trequest->metadata().merge(metadata);\n+\tControlList &requestMetadata = requestQueue_.front().second;\n+\trequestMetadata.merge(metadata);\n \n \t/*\n \t * Inform the sensor of the latest colour gains if it has the\n@@ -1392,7 +1392,7 @@ void CameraData::clearIncompleteRequests()\n \t * back to the application.\n \t */\n \twhile (!requestQueue_.empty()) {\n-\t\tRequest *request = requestQueue_.front();\n+\t\tauto &[request, metadata] = requestQueue_.front();\n \n \t\tfor (auto &b : request->buffers()) {\n \t\t\tFrameBuffer *buffer = b.second;\n@@ -1406,6 +1406,9 @@ void CameraData::clearIncompleteRequests()\n \t\t\t}\n \t\t}\n \n+\t\t// TODO: need this when cancelled?\n+\t\trequest->metadata().merge(metadata);\n+\n \t\tpipe()->completeRequest(request);\n \t\trequestQueue_.pop();\n \t}\n@@ -1418,7 +1421,7 @@ void CameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n \t * that we actually have one to action, otherwise we just return\n \t * buffer back to the stream.\n \t */\n-\tRequest *request = requestQueue_.empty() ? nullptr : requestQueue_.front();\n+\tRequest *request = requestQueue_.empty() ? nullptr : requestQueue_.front().first;\n \tif (!dropFrameCount_ && request && request->findBuffer(stream) == buffer) {\n \t\t/*\n \t\t * Tag the buffer as completed, returning it to the\n@@ -1471,7 +1474,7 @@ void CameraData::checkRequestCompleted()\n \t * change the state to IDLE when ready.\n \t */\n \tif (!dropFrameCount_) {\n-\t\tRequest *request = requestQueue_.front();\n+\t\tauto &[request, metadata] = requestQueue_.front();\n \t\tif (request->hasPendingBuffers())\n \t\t\treturn;\n \n@@ -1482,6 +1485,8 @@ void CameraData::checkRequestCompleted()\n \t\tLOG(RPI, Debug) << \"Completing request sequence: \"\n \t\t\t\t<< request->sequence();\n \n+\t\trequest->metadata().merge(metadata);\n+\n \t\tpipe()->completeRequest(request);\n \t\trequestQueue_.pop();\n \t\trequestCompleted = true;\n@@ -1504,10 +1509,10 @@ void CameraData::checkRequestCompleted()\n \t}\n }\n \n-void CameraData::fillRequestMetadata(const ControlList &bufferControls, Request *request)\n+void CameraData::fillRequestMetadata(const ControlList &bufferControls, ControlList &metadata)\n {\n-\trequest->metadata().set(controls::SensorTimestamp,\n-\t\t\t\tbufferControls.get(controls::SensorTimestamp).value_or(0));\n+\tmetadata.set(controls::SensorTimestamp,\n+\t\t bufferControls.get(controls::SensorTimestamp).value_or(0));\n \n \tif (cropParams_.size()) {\n \t\tstd::vector<Rectangle> crops;\n@@ -1515,10 +1520,10 @@ void CameraData::fillRequestMetadata(const ControlList &bufferControls, Request\n \t\tfor (auto const &[k, v] : cropParams_)\n \t\t\tcrops.push_back(scaleIspCrop(v.ispCrop));\n \n-\t\trequest->metadata().set(controls::ScalerCrop, crops[0]);\n+\t\tmetadata.set(controls::ScalerCrop, crops[0]);\n \t\tif (crops.size() > 1) {\n-\t\t\trequest->metadata().set(controls::rpi::ScalerCrops,\n-\t\t\t\t\t\tSpan<const Rectangle>(crops.data(), crops.size()));\n+\t\t\tmetadata.set(controls::rpi::ScalerCrops,\n+\t\t\t\t Span<const Rectangle>(crops.data(), crops.size()));\n \t\t}\n \t}\n }\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h\nindex aae0c2f35..d3a1bd216 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -129,7 +129,7 @@ public:\n \t\treturn state_ != State::Stopped && state_ != State::Error;\n \t}\n \n-\tstd::queue<Request *> requestQueue_;\n+\tstd::queue<std::pair<Request *, ControlList>> requestQueue_;\n \n \t/* For handling digital zoom. */\n \tIPACameraSensorInfo sensorInfo_;\n@@ -179,7 +179,7 @@ public:\n \n protected:\n \tvoid fillRequestMetadata(const ControlList &bufferControls,\n-\t\t\t\t Request *request);\n+\t\t\t\t ControlList &metadata);\n \n \tvirtual void tryRunPipeline() = 0;\n \ndiff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\nindex 91e7f4c94..8436cb4fa 100644\n--- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n+++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp\n@@ -2318,7 +2318,7 @@ void PiSPCameraData::tryRunPipeline()\n \tCfeJob &job = cfeJobQueue_.front();\n \n \t/* Take the first request from the queue and action the IPA. */\n-\tRequest *request = requestQueue_.front();\n+\tauto &[request, metadata] = requestQueue_.front();\n \n \t/* See if a new ScalerCrop value needs to be applied. */\n \tapplyScalerCrop(request->controls());\n@@ -2328,8 +2328,8 @@ void PiSPCameraData::tryRunPipeline()\n \t * related controls. We clear it first because the request metadata\n \t * may have been populated if we have dropped the previous frame.\n \t */\n-\trequest->metadata().clear();\n-\tfillRequestMetadata(job.sensorControls, request);\n+\tmetadata.clear();\n+\tfillRequestMetadata(job.sensorControls, metadata);\n \n \t/* Set our state to say the pipeline is active. */\n \tstate_ = State::Busy;\n@@ -2347,7 +2347,7 @@ void PiSPCameraData::tryRunPipeline()\n \tparams.buffers.bayer = RPi::MaskBayerData | bayerId;\n \tparams.buffers.stats = RPi::MaskStats | statsId;\n \tparams.buffers.embedded = 0;\n-\tparams.ipaContext = requestQueue_.front()->sequence();\n+\tparams.ipaContext = requestQueue_.front().first->sequence();\n \tparams.delayContext = job.delayContext;\n \tparams.sensorControls = std::move(job.sensorControls);\n \tparams.requestControls = request->controls();\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex fe910bdf2..a311f43a4 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -836,7 +836,7 @@ void Vc4CameraData::ispOutputDequeue(FrameBuffer *buffer)\n \tif (stream == &isp_[Isp::Stats]) {\n \t\tipa::RPi::ProcessParams params;\n \t\tparams.buffers.stats = index | RPi::MaskStats;\n-\t\tparams.ipaContext = requestQueue_.front()->sequence();\n+\t\tparams.ipaContext = requestQueue_.front().first->sequence();\n \t\tipa_->processStats(params);\n \t} else {\n \t\t/* Any other ISP output can be handed back to the application now. */\n@@ -935,7 +935,7 @@ void Vc4CameraData::tryRunPipeline()\n \t\treturn;\n \n \t/* Take the first request from the queue and action the IPA. */\n-\tRequest *request = requestQueue_.front();\n+\tauto &[request, metadata] = requestQueue_.front();\n \n \t/* See if a new ScalerCrop value needs to be applied. */\n \tapplyScalerCrop(request->controls());\n@@ -945,8 +945,8 @@ void Vc4CameraData::tryRunPipeline()\n \t * related controls. We clear it first because the request metadata\n \t * may have been populated if we have dropped the previous frame.\n \t */\n-\trequest->metadata().clear();\n-\tfillRequestMetadata(bayerFrame.controls, request);\n+\tmetadata.clear();\n+\tfillRequestMetadata(bayerFrame.controls, metadata);\n \n \t/* Set our state to say the pipeline is active. */\n \tstate_ = State::Busy;\n", "prefixes": [ "RFC", "v1", "20/23" ] }