Patch Detail
Show a patch.
GET /api/patches/25651/?format=api
{ "id": 25651, "url": "https://patchwork.libcamera.org/api/patches/25651/?format=api", "web_url": "https://patchwork.libcamera.org/patch/25651/", "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": "<20260106165754.1759831-22-barnabas.pocze@ideasonboard.com>", "date": "2026-01-06T16:57:53", "name": "[v4,21/22] libcamera: pipeline: Use `metadataAvailable()`", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a0ce17f94ef27666386d696cd10848941fa61879", "submitter": { "id": 216, "url": "https://patchwork.libcamera.org/api/people/216/?format=api", "name": "Barnabás Pőcze", "email": "barnabas.pocze@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/25651/mbox/", "series": [ { "id": 5688, "url": "https://patchwork.libcamera.org/api/series/5688/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5688", "date": "2026-01-06T16:57:32", "name": "libcamera: Add `MetadataList`", "version": 4, "mbox": "https://patchwork.libcamera.org/series/5688/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/25651/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/25651/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 90762C32E7\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 6 Jan 2026 16:58:21 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D02F562002;\n\tTue, 6 Jan 2026 17:58:19 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 551FC61FE7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 6 Jan 2026 17:58:03 +0100 (CET)", "from pb-laptop.local (185.221.143.114.nat.pool.zt.hu\n\t[185.221.143.114])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 451B32800;\n\tTue, 6 Jan 2026 17:57:42 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Jo1TzhNV\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1767718662;\n\tbh=zvJ2msDbWkuKhWI5EL3308A+BY/rq7hbpMaqWJZHpr8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Jo1TzhNVfw39d91OGCQ9cJBjIfTb1tU2lQ1HDVfhArkrXAflnk1+x+r9bZXCfp+jA\n\tECTe2rslw7MusIjFxcK2NtWtCbBxLzzC7Gm+RDcj7+LJb6T8G8Qj1X0ohvUSxkjoXh\n\t4ZGd52QJjTBy2hcAenyLJ65tXpb5nCwIsb+NdxFM=", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v4 21/22] libcamera: pipeline: Use `metadataAvailable()`", "Date": "Tue, 6 Jan 2026 17:57:53 +0100", "Message-ID": "<20260106165754.1759831-22-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260106165754.1759831-1-barnabas.pocze@ideasonboard.com>", "References": "<20260106165754.1759831-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": "From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n\nUse the newly introduced `metadataAvailable()` function to send metadata\nitems to the application.\n\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n[Adjust commit message, adjust rpi changes.]\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\nchanges in v2:\n * include rpi changes as well\n---\n src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 5 +--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 14 ++++----\n src/libcamera/pipeline/mali-c55/mali-c55.cpp | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 10 +++---\n .../pipeline/rpi/common/pipeline_base.cpp | 36 +++++++++----------\n src/libcamera/pipeline/simple/simple.cpp | 6 ++--\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 3 +-\n src/libcamera/pipeline/vimc/vimc.cpp | 3 +-\n src/libcamera/pipeline/virtual/virtual.cpp | 2 +-\n 9 files changed, 39 insertions(+), 42 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\nindex b1111f19d..ff2c39c70 100644\n--- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n+++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n@@ -1128,10 +1128,7 @@ void PipelineHandlerISI::bufferReady(FrameBuffer *buffer)\n \tRequest *request = buffer->request();\n \n \t/* Record the sensor's timestamp in the request metadata. */\n-\tControlList &metadata = request->_d()->metadata();\n-\tif (!metadata.contains(controls::SensorTimestamp.id()))\n-\t\tmetadata.set(controls::SensorTimestamp,\n-\t\t\t buffer->metadata().timestamp);\n+\tmetadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);\n \n \tcompleteBuffer(request, buffer);\n \tif (request->hasPendingBuffers())\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 04549899c..a44d3e7e4 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1254,7 +1254,7 @@ void IPU3CameraData::metadataReady(unsigned int id, const ControlList &metadata)\n \t\treturn;\n \n \tRequest *request = info->request;\n-\trequest->_d()->metadata().merge(metadata);\n+\tpipe()->metadataAvailable(request, metadata);\n \n \tinfo->metadataProcessed = true;\n \tif (frameInfos_.tryComplete(info))\n@@ -1281,12 +1281,14 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \n \tpipe()->completeBuffer(request, buffer);\n \n-\trequest->_d()->metadata().set(controls::draft::PipelineDepth, 3);\n+\tpipe()->metadataAvailable(request, controls::draft::PipelineDepth, 3);\n+\n \t/* \\todo Actually apply the scaler crop region to the ImgU. */\n \tconst auto &scalerCrop = request->controls().get(controls::ScalerCrop);\n \tif (scalerCrop)\n \t\tcropRegion_ = *scalerCrop;\n-\trequest->_d()->metadata().set(controls::ScalerCrop, cropRegion_);\n+\n+\tpipe()->metadataAvailable(request, controls::ScalerCrop, cropRegion_);\n \n \tif (frameInfos_.tryComplete(info))\n \t\tpipe()->completeRequest(request);\n@@ -1326,8 +1328,7 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n \t * \\todo The sensor timestamp should be better estimated by connecting\n \t * to the V4L2Device::frameStart signal.\n \t */\n-\trequest->_d()->metadata().set(controls::SensorTimestamp,\n-\t\t\t\t buffer->metadata().timestamp);\n+\tpipe()->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);\n \n \tinfo->effectiveSensorControls = delayedCtrls_->get(buffer->metadata().sequence);\n \n@@ -1421,8 +1422,7 @@ void IPU3CameraData::frameStart(uint32_t sequence)\n \t\treturn;\n \t}\n \n-\trequest->_d()->metadata().set(controls::draft::TestPatternMode,\n-\t\t\t\t *testPatternMode);\n+\tpipe()->metadataAvailable(request, controls::draft::TestPatternMode, *testPatternMode);\n }\n \n REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3, \"ipu3\")\ndiff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\nindex f66615265..3e40be5f8 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -1528,7 +1528,7 @@ void PipelineHandlerMaliC55::statsProcessed(unsigned int requestId,\n \tMaliC55FrameInfo &frameInfo = frameInfoMap_[requestId];\n \n \tframeInfo.statsDone = true;\n-\tframeInfo.request->_d()->metadata().merge(metadata);\n+\tmetadataAvailable(frameInfo.request, metadata);\n \n \ttryComplete(&frameInfo);\n }\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex d2cd1d4b8..42a8da65b 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -507,7 +507,7 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta\n \tif (!info)\n \t\treturn;\n \n-\tinfo->request->_d()->metadata().merge(metadata);\n+\tpipe()->metadataAvailable(info->request, metadata);\n \tinfo->metadataProcessed = true;\n \n \tpipe()->tryCompleteRequest(info);\n@@ -1645,8 +1645,7 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n \t\t * \\todo The sensor timestamp should be better estimated by connecting\n \t\t * to the V4L2Device::frameStart signal.\n \t\t */\n-\t\trequest->_d()->metadata().set(controls::SensorTimestamp,\n-\t\t\t\t\t metadata.timestamp);\n+\t\tmetadataAvailable(request, controls::SensorTimestamp, metadata.timestamp);\n \n \t\tif (isRaw_) {\n \t\t\tconst ControlList &ctrls =\n@@ -1688,7 +1687,10 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n \t\treturn;\n \t}\n \n-\tdewarper_->populateMetadata(&data->mainPathStream_, request->_d()->metadata());\n+\t// FIXME: !!!!\n+\tControlList meta;\n+\tdewarper_->populateMetadata(&data->mainPathStream_, meta);\n+\tmetadataAvailable(request, meta);\n }\n \n void PipelineHandlerRkISP1::dewarpBufferReady(FrameBuffer *buffer)\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex c50697877..f99d827b9 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -1235,7 +1235,7 @@ void CameraData::metadataReady(const ControlList &metadata)\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->_d()->metadata().merge(metadata);\n+\tpipe()->metadataAvailable(request, metadata);\n \n \t/*\n \t * Inform the sensor of the latest colour gains if it has the\n@@ -1505,24 +1505,24 @@ void CameraData::checkRequestCompleted()\n \n void CameraData::fillRequestMetadata(const ControlList &bufferControls, Request *request)\n {\n-\tif (auto x = bufferControls.get(controls::SensorTimestamp))\n-\t\trequest->_d()->metadata().set(controls::SensorTimestamp, *x);\n-\tif (auto x = bufferControls.get(controls::FrameWallClock))\n-\t\trequest->_d()->metadata().set(controls::FrameWallClock, *x);\n-\n-\tif (cropParams_.size()) {\n-\t\tstd::vector<Rectangle> crops;\n-\n-\t\tfor (auto const &[k, v] : cropParams_)\n-\t\t\tcrops.push_back(scaleIspCrop(v.ispCrop));\n-\n-\t\trequest->_d()->metadata().set(controls::ScalerCrop, crops[0]);\n-\t\tif (crops.size() > 1) {\n-\t\t\trequest->_d()->metadata().set(controls::rpi::ScalerCrops,\n-\t\t\t\t\t\t Span<const Rectangle>(crops.data(),\n-\t\t\t\t\t\t\t\t\t crops.size()));\n+\tpipe()->metadataAvailable(request, [&](auto set) {\n+\t\tif (auto x = bufferControls.get(controls::SensorTimestamp))\n+\t\t\tset(controls::SensorTimestamp, *x);\n+\t\tif (auto x = bufferControls.get(controls::FrameWallClock))\n+\t\t\tset(controls::FrameWallClock, *x);\n+\n+\t\tif (cropParams_.size()) {\n+\t\t\tstd::vector<Rectangle> crops;\n+\n+\t\t\tfor (auto const &[k, v] : cropParams_)\n+\t\t\t\tcrops.push_back(scaleIspCrop(v.ispCrop));\n+\n+\t\t\tset(controls::ScalerCrop, crops[0]);\n+\n+\t\t\tif (crops.size() > 1)\n+\t\t\t\tset(controls::rpi::ScalerCrops, { crops.data(), crops.size() });\n \t\t}\n-\t}\n+\t});\n }\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex f1925cdf7..81e15f09c 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -940,8 +940,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t}\n \n \tif (request)\n-\t\trequest->_d()->metadata().set(controls::SensorTimestamp,\n-\t\t\t\t\t buffer->metadata().timestamp);\n+\t\tpipe->metadataAvailable(request, controls::SensorTimestamp,\n+\t\t\t\t\tbuffer->metadata().timestamp);\n \n \t/*\n \t * Queue the captured and the request buffer to the converter or Software\n@@ -1036,7 +1036,7 @@ void SimpleCameraData::metadataReady(uint32_t frame, const ControlList &metadata\n \tif (!info)\n \t\treturn;\n \n-\tinfo->request->_d()->metadata().merge(metadata);\n+\tpipe()->metadataAvailable(info->request, metadata);\n \tinfo->metadataProcessed = true;\n \ttryCompleteRequest(info->request);\n }\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex fcd25cf4e..0b67e39bd 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -897,8 +897,7 @@ void UVCCameraData::imageBufferReady(FrameBuffer *buffer)\n \tRequest *request = buffer->request();\n \n \t/* \\todo Use the UVC metadata to calculate a more precise timestamp */\n-\trequest->_d()->metadata().set(controls::SensorTimestamp,\n-\t\t\t\t buffer->metadata().timestamp);\n+\tpipe()->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);\n \n \tpipe()->completeBuffer(request, buffer);\n \tpipe()->completeRequest(request);\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 182aa56e8..7adaa0cc8 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -620,8 +620,7 @@ void VimcCameraData::imageBufferReady(FrameBuffer *buffer)\n \t}\n \n \t/* Record the sensor's timestamp in the request metadata. */\n-\trequest->_d()->metadata().set(controls::SensorTimestamp,\n-\t\t\t\t buffer->metadata().timestamp);\n+\tpipe->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);\n \n \tpipe->completeBuffer(request, buffer);\n \tpipe->completeRequest(request);\ndiff --git a/src/libcamera/pipeline/virtual/virtual.cpp b/src/libcamera/pipeline/virtual/virtual.cpp\nindex 40c35264c..bb982a6c0 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -366,7 +366,7 @@ int PipelineHandlerVirtual::queueRequestDevice([[maybe_unused]] Camera *camera,\n \tVirtualCameraData *data = cameraData(camera);\n \tconst auto timestamp = currentTimestamp();\n \n-\trequest->_d()->metadata().set(controls::SensorTimestamp, timestamp);\n+\tmetadataAvailable(request, controls::SensorTimestamp, timestamp);\n \tdata->invokeMethod(&VirtualCameraData::processRequest,\n \t\t\t ConnectionTypeQueued, request);\n \n", "prefixes": [ "v4", "21/22" ] }