Patch Detail
Show a patch.
GET /api/1.1/patches/23889/?format=api
{ "id": 23889, "url": "https://patchwork.libcamera.org/api/1.1/patches/23889/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23889/", "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": "<20250721104622.1550908-22-barnabas.pocze@ideasonboard.com>", "date": "2025-07-21T10:46:21", "name": "[RFC,v2,21/22] libcamera: pipeline: Use `metadataAvailable()`", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "477a301cc1a7656aa81d2a2b9d43251d37de8a8a", "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/23889/mbox/", "series": [ { "id": 5305, "url": "https://patchwork.libcamera.org/api/1.1/series/5305/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5305", "date": "2025-07-21T10:46:00", "name": "libcamera: Add `MetadataList`", "version": 2, "mbox": "https://patchwork.libcamera.org/series/5305/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23889/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23889/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 CF982C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 21 Jul 2025 10:47:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 17AB06900F;\n\tMon, 21 Jul 2025 12:47:06 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B7F7C68FE5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 21 Jul 2025 12:46:38 +0200 (CEST)", "from pb-laptop.local (185.221.140.39.nat.pool.zt.hu\n\t[185.221.140.39])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D6F3E7984;\n\tMon, 21 Jul 2025 12:46:01 +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=\"PI4ENj2j\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1753094762;\n\tbh=yk180zDa/CYy8jsqs6FsrD14hz5WopBapQbZS0JGjVc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=PI4ENj2j3xcJunABlBPPCuJBV92PVHZMaMm6pMBaUh2c6/1+f7ALhi0llzvQjMFqo\n\tbhPWt0NZCIRH3ihCzILx5H5U9OFTEKt3mDfBLwFmJnR+PgxJKGoOsu9YKbiIhbckYI\n\taSFowHLc+p0Lj5MwlysUZEkJZNGqHBxcRNHKNAag=", "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>", "Subject": "[RFC PATCH v2 21/22] libcamera: pipeline: Use `metadataAvailable()`", "Date": "Mon, 21 Jul 2025 12:46:21 +0200", "Message-ID": "<20250721104622.1550908-22-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.50.1", "In-Reply-To": "<20250721104622.1550908-1-barnabas.pocze@ideasonboard.com>", "References": "<20250721104622.1550908-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>\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 | 7 ++---\n .../pipeline/rpi/common/pipeline_base.cpp | 29 ++++++++++---------\n src/libcamera/pipeline/simple/simple.cpp | 4 +--\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, 32 insertions(+), 37 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\nindex e452fe2f8..579847367 100644\n--- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n+++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n@@ -1098,10 +1098,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->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 e6a7f675a..0d310b5b4 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1250,7 +1250,7 @@ void IPU3CameraData::metadataReady(unsigned int id, const ControlList &metadata)\n \t\treturn;\n \n \tRequest *request = info->request;\n-\trequest->metadata().merge(metadata);\n+\tpipe()->metadataAvailable(request, metadata);\n \n \tinfo->metadataProcessed = true;\n \tif (frameInfos_.tryComplete(info))\n@@ -1277,12 +1277,14 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \n \tpipe()->completeBuffer(request, buffer);\n \n-\trequest->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->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@@ -1322,8 +1324,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->metadata().set(controls::SensorTimestamp,\n-\t\t\t\tbuffer->metadata().timestamp);\n+\tpipe()->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);\n \n \tinfo->effectiveSensorControls = delayedCtrls_->get(buffer->metadata().sequence);\n \n@@ -1417,8 +1418,7 @@ void IPU3CameraData::frameStart(uint32_t sequence)\n \t\treturn;\n \t}\n \n-\trequest->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 19980f6d2..d1a107629 100644\n--- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n+++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp\n@@ -1523,7 +1523,7 @@ void PipelineHandlerMaliC55::statsProcessed(unsigned int requestId,\n \tMaliC55FrameInfo &frameInfo = frameInfoMap_[requestId];\n \n \tframeInfo.statsDone = true;\n-\tframeInfo.request->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 6dce1844d..47ef52699 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -451,7 +451,7 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta\n \tif (!info)\n \t\treturn;\n \n-\tinfo->request->metadata().merge(metadata);\n+\tpipe()->metadataAvailable(info->request, metadata);\n \tinfo->metadataProcessed = true;\n \n \tpipe()->tryCompleteRequest(info);\n@@ -1497,8 +1497,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->metadata().set(controls::SensorTimestamp,\n-\t\t\t\t\tmetadata.timestamp);\n+\t\tmetadataAvailable(request, controls::SensorTimestamp, metadata.timestamp);\n \n \t\tif (isRaw_) {\n \t\t\tconst ControlList &ctrls =\n@@ -1581,7 +1580,7 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n \t\tLOG(RkISP1, Error) << \"Cannot queue buffers to dewarper: \"\n \t\t\t\t << strerror(-ret);\n \n-\trequest->metadata().set(controls::ScalerCrop, activeCrop_.value());\n+\tmetadataAvailable(request, controls::ScalerCrop, activeCrop_.value());\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 f2a9a15cd..1d497f6f0 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -1225,7 +1225,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->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@@ -1495,23 +1495,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->metadata().set(controls::SensorTimestamp, *x);\n-\tif (auto x = bufferControls.get(controls::FrameWallClock))\n-\t\trequest->metadata().set(controls::FrameWallClock, *x);\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-\tif (cropParams_.size()) {\n-\t\tstd::vector<Rectangle> crops;\n+\t\tif (cropParams_.size()) {\n+\t\t\tstd::vector<Rectangle> crops;\n \n-\t\tfor (auto const &[k, v] : cropParams_)\n-\t\t\tcrops.push_back(scaleIspCrop(v.ispCrop));\n+\t\t\tfor (auto const &[k, v] : cropParams_)\n+\t\t\t\tcrops.push_back(scaleIspCrop(v.ispCrop));\n \n-\t\trequest->metadata().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\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 05387ca7c..28399cb67 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -909,7 +909,7 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t}\n \n \tif (request)\n-\t\trequest->metadata().set(controls::SensorTimestamp,\n+\t\tpipe->metadataAvailable(request, controls::SensorTimestamp,\n \t\t\t\t\tbuffer->metadata().timestamp);\n \n \t/*\n@@ -997,7 +997,7 @@ void SimpleCameraData::metadataReady(uint32_t frame, const ControlList &metadata\n \tif (!info)\n \t\treturn;\n \n-\tinfo->request->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 59fb4bd5c..8cea94721 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -894,8 +894,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->metadata().set(controls::SensorTimestamp,\n-\t\t\t\tbuffer->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 9d73e320c..4432de4a0 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -617,8 +617,7 @@ void VimcCameraData::imageBufferReady(FrameBuffer *buffer)\n \t}\n \n \t/* Record the sensor's timestamp in the request metadata. */\n-\trequest->metadata().set(controls::SensorTimestamp,\n-\t\t\t\tbuffer->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 049ebcba5..93c1733d6 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -331,7 +331,7 @@ int PipelineHandlerVirtual::queueRequestDevice([[maybe_unused]] Camera *camera,\n \t\tASSERT(found);\n \t}\n \n-\trequest->metadata().set(controls::SensorTimestamp, timestamp);\n+\tmetadataAvailable(request, controls::SensorTimestamp, timestamp);\n \tcompleteRequest(request);\n \n \treturn 0;\n", "prefixes": [ "RFC", "v2", "21/22" ] }