Patch Detail
Show a patch.
GET /api/1.1/patches/23504/?format=api
{ "id": 23504, "url": "https://patchwork.libcamera.org/api/1.1/patches/23504/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23504/", "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-20-barnabas.pocze@ideasonboard.com>", "date": "2025-06-06T16:41:52", "name": "[RFC,v1,19/23] libcamera: pipeline: Use `metadataAvailable()`", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "bceaead0c8296d3b300524d2729d31b229d9a51a", "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/23504/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/23504/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23504/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 58973C3332\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 6 Jun 2025 16:42:57 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CACE968DE8;\n\tFri, 6 Jun 2025 18:42:56 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5DE9F68DD2\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 CC9468DB;\n\tFri, 6 Jun 2025 18:42:15 +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=\"a2xtG28F\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1749228135;\n\tbh=Qxjl4B3Hqig3nKlEdVu8Edjg8HHs7ry8jruyMLKQ0TQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=a2xtG28FYAEqT1ls6Uph+f1CBexUlNyZWHQf94n1CGDfn4CukWDT5UiFY1zRjl77I\n\tMZ3jirjozme889PCf06U322omY7Fnp147Zi8HlKyFRa+ZoQdLdUdvO+8cHRkMTrIht\n\tqSZpMHGWlvHdl6Es9lIVjXMtQFbMaOsW3d1gfSqY=", "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 v1 19/23] libcamera: pipeline: Use `metadataAvailable()`", "Date": "Fri, 6 Jun 2025 18:41:52 +0200", "Message-ID": "<20250606164156.1442682-20-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": "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, split rpi changes.]\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n---\nOriginal: https://patchwork.libcamera.org/patch/22232/\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 src/libcamera/pipeline/simple/simple.cpp | 5 +++--\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 8 files changed, 18 insertions(+), 23 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\nindex 1c6da2006..f07df2d59 100644\n--- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n+++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n@@ -1100,10 +1100,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 b4a4283f4..0f59d0727 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 34be87087..aa5ea8799 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -433,7 +433,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@@ -1476,8 +1476,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@@ -1560,7 +1559,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/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 05387ca7c..937c781c6 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -909,7 +909,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t}\n \n \tif (request)\n-\t\trequest->metadata().set(controls::SensorTimestamp,\n+\t\t// TODO: is this correct? should it be set later?\n+\t\tpipe->metadataAvailable(request, controls::SensorTimestamp,\n \t\t\t\t\tbuffer->metadata().timestamp);\n \n \t/*\n@@ -997,7 +998,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 e0036e3b5..d1bdc1c24 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -883,8 +883,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 f8a29da41..59445627b 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", "v1", "19/23" ] }