Patch Detail
Show a patch.
GET /api/patches/25339/?format=api
{ "id": 25339, "url": "https://patchwork.libcamera.org/api/patches/25339/?format=api", "web_url": "https://patchwork.libcamera.org/patch/25339/", "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": "<20251202-cam-control-override-v3-2-eacab052798d@ideasonboard.com>", "date": "2025-12-02T14:49:27", "name": "[v3,2/5] libcamera: request: Move metadata_ to Private", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b101d674fb5f0a9028888d9b2e3f4a3f064c8869", "submitter": { "id": 143, "url": "https://patchwork.libcamera.org/api/people/143/?format=api", "name": "Jacopo Mondi", "email": "jacopo.mondi@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/25339/mbox/", "series": [ { "id": 5633, "url": "https://patchwork.libcamera.org/api/series/5633/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5633", "date": "2025-12-02T14:49:25", "name": "libcamera: ipc: ControlLists without valid idmap break IPC", "version": 3, "mbox": "https://patchwork.libcamera.org/series/5633/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/25339/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/25339/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 DE965C3260\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 2 Dec 2025 14:49:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 09A6F60D3A;\n\tTue, 2 Dec 2025 15:49:42 +0100 (CET)", "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 7FBFA6096B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 2 Dec 2025 15:49:36 +0100 (CET)", "from [192.168.1.104] (net-93-65-100-155.cust.vodafonedsl.it\n\t[93.65.100.155])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1E5B43E6;\n\tTue, 2 Dec 2025 15:47:22 +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=\"pCjCoy6N\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1764686842;\n\tbh=YuWVXKCIjzmJND0G77WDeXmPHN/1+rKHaSFTIacqhrU=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=pCjCoy6NLKzwc4T9c8S1zCjmcKwIJyLeuQMkwCzPxXRafx0fEUatNzMmKttZDNSNJ\n\tA0ladCV3u6ckQDO6wD0A9Cp80/u5Kotj3o/8g9o+qaO+MYKlB1AOCaeHy3psNeUvu7\n\t5/JpL2pqbikd0i/yloFS4xVyaSHkF5tAaKxWMTKI=", "From": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Date": "Tue, 02 Dec 2025 15:49:27 +0100", "Subject": "[PATCH v3 2/5] libcamera: request: Move metadata_ to Private", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20251202-cam-control-override-v3-2-eacab052798d@ideasonboard.com>", "References": "<20251202-cam-control-override-v3-0-eacab052798d@ideasonboard.com>", "In-Reply-To": "<20251202-cam-control-override-v3-0-eacab052798d@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>, \n\tPaul Elder <paul.elder@ideasonboard.com>", "X-Mailer": "b4 0.14.2", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=19873;\n\ti=jacopo.mondi@ideasonboard.com; h=from:subject:message-id;\n\tbh=YuWVXKCIjzmJND0G77WDeXmPHN/1+rKHaSFTIacqhrU=;\n\tb=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpLvx+OQ2qGND3KhdQDOUjtxOAZqUBCjnqHVFje\n\tvxgOJPGltKJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaS78fgAKCRByNAaPFqFW\n\tPEYxD/47RaWCt+NPWS3TeuMqHKZ85LS4tpjjq0SnwIXBR+6G+ymx4tppu+DppwMQkBk/3TYKJpK\n\tY4pKuKU8Hh4YqtSDGBNP3vFyWJJTHLz4EdPaI0vsc0DQI18QcJB87pUtnuUYhSyVf+1Sx9Wc0KD\n\txs6/0IRo5JfBYrhjYzxAhuAxXyAt8v01ShaMzIVkkIAi3RRMl8YqZCEVrYMLjKyljGjjNEvZCK9\n\tLozDNst+JidRDKJHNUUEyh7dlgLOYhem33U0G4zXEgy7e8uNY6reLK90OVewfoXkQawWSldO2R8\n\trJBFoBT9ylXHTcwn17J/vuiAK5cAte8P4JM/04ILEoet+Vh0oU5P+iBzG8H2TyiRY0I89Rv63FV\n\tI5vkqKksDN3QIwymJtf0eTaspbA+AEl42a50N5GbtENzzCiZ8+XYt0Lsft4DHsMgiy/oO8fo4Wo\n\tnyOIVBOlySGL8F2oZpjthufrEN1dvTL8Tq5SxQ8X1k9q4CY5zMTyyN8JOx4DDj5RXySI7f1sIgk\n\trVjSPEWxb7D58PBXcbX8cG+THD5wrT39p5l98rzw3RMlJV81Y6ySD/APY5cNXufTaUvSkOJ8g4r\n\tJ/RUnXe4RKUvQp5iPqUjQDJYAgDhQwKrh/WcSHDoMlqxxA3MY0WNEzJqvaDCcCTRKnhoy4XMej2\n\tJq/2Gzq+7VrekUw==", "X-Developer-Key": "i=jacopo.mondi@ideasonboard.com; a=openpgp;\n\tfpr=72392EDC88144A65C701EA9BA5826A2587AD026B", "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": "Address a long standing \\todo item that suggested to implement a\nread-only interface for the Request::metadata() accessor and deflect to\nthe internal implementation for the read-write accessor used by pipeline\nhandlers.\n\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\nAcked-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n include/libcamera/internal/request.h | 3 ++\n include/libcamera/request.h | 3 +-\n src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 3 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 16 +++++-----\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 | 13 ++++----\n src/libcamera/pipeline/rpi/common/pipeline_base.h | 2 +-\n src/libcamera/pipeline/simple/simple.cpp | 8 ++---\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 6 ++--\n src/libcamera/pipeline/vimc/vimc.cpp | 6 ++--\n src/libcamera/pipeline/virtual/virtual.cpp | 4 +--\n src/libcamera/request.cpp | 37 ++++++++++++----------\n 13 files changed, 61 insertions(+), 52 deletions(-)", "diff": "diff --git a/include/libcamera/internal/request.h b/include/libcamera/internal/request.h\nindex 78cb99f3604504dfb7145c605835b7493b656ced..643f67cabf5778f7515c0117d06d4e0a3fdec4f8 100644\n--- a/include/libcamera/internal/request.h\n+++ b/include/libcamera/internal/request.h\n@@ -36,6 +36,8 @@ public:\n \tCamera *camera() const { return camera_; }\n \tbool hasPendingBuffers() const;\n \n+\tControlList &metadata() { return *metadata_; }\n+\n \tbool completeBuffer(FrameBuffer *buffer);\n \tvoid complete();\n \tvoid cancel();\n@@ -61,6 +63,7 @@ private:\n \tstd::unordered_set<FrameBuffer *> pending_;\n \tstd::map<FrameBuffer *, EventNotifier> notifiers_;\n \tstd::unique_ptr<Timer> timer_;\n+\tControlList *metadata_;\n };\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex 0c5939f7b3336fd089a2fe231f4f6f266cc422f7..c9aeddb62680923dc3490a23dc6c3f70f70cc075 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -50,7 +50,7 @@ public:\n \tvoid reuse(ReuseFlag flags = Default);\n \n \tControlList &controls() { return *controls_; }\n-\tControlList &metadata() { return *metadata_; }\n+\tconst ControlList &metadata() const;\n \tconst BufferMap &buffers() const { return bufferMap_; }\n \tint addBuffer(const Stream *stream, FrameBuffer *buffer,\n \t\t std::unique_ptr<Fence> &&fence = {});\n@@ -68,7 +68,6 @@ private:\n \tLIBCAMERA_DISABLE_COPY(Request)\n \n \tControlList *controls_;\n-\tControlList *metadata_;\n \tBufferMap bufferMap_;\n \n \tconst uint64_t cookie_;\ndiff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\nindex 008155ff21a7b398ef6bbe3c1379444ced26bdc5..706681fce5629bc4bd832923294e87a1ac8794cf 100644\n--- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n+++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n@@ -27,6 +27,7 @@\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/media_pipeline.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/request.h\"\n #include \"libcamera/internal/v4l2_subdevice.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n@@ -1125,7 +1126,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+\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);\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 695762c750f89b5c8d10c221c6a9b3d7bd9ac6e7..0190f677e6794979b04b5729b2ffa88451a08ccb 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -19,7 +19,6 @@\n #include <libcamera/control_ids.h>\n #include <libcamera/formats.h>\n #include <libcamera/property_ids.h>\n-#include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n #include <libcamera/ipa/ipu3_ipa_interface.h>\n@@ -35,6 +34,7 @@\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/request.h\"\n \n #include \"cio2.h\"\n #include \"frames.h\"\n@@ -1249,7 +1249,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+\trequest->_d()->metadata().merge(metadata);\n \n \tinfo->metadataProcessed = true;\n \tif (frameInfos_.tryComplete(info))\n@@ -1276,12 +1276,12 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)\n \n \tpipe()->completeBuffer(request, buffer);\n \n-\trequest->metadata().set(controls::draft::PipelineDepth, 3);\n+\trequest->_d()->metadata().set(controls::draft::PipelineDepth, 3);\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+\trequest->_d()->metadata().set(controls::ScalerCrop, cropRegion_);\n \n \tif (frameInfos_.tryComplete(info))\n \t\tpipe()->completeRequest(request);\n@@ -1321,8 +1321,8 @@ 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+\trequest->_d()->metadata().set(controls::SensorTimestamp,\n+\t\t\t\t buffer->metadata().timestamp);\n \n \tinfo->effectiveSensorControls = delayedCtrls_->get(buffer->metadata().sequence);\n \n@@ -1416,8 +1416,8 @@ 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+\trequest->_d()->metadata().set(controls::draft::TestPatternMode,\n+\t\t\t\t *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 cf0cb15f8bb39143eea38aa8acb8d2b1268f5530..77f251416f718c8715d9df5d69a9c004e01b6561 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->metadata().merge(metadata);\n+\tframeInfo.request->_d()->metadata().merge(metadata);\n \n \ttryComplete(&frameInfo);\n }\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 5fd1102695070667e76daaf868e8d801f0ff70dd..320a4dc5a899b11cf56141a841f63436f0d29a37 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -26,7 +26,6 @@\n #include <libcamera/formats.h>\n #include <libcamera/framebuffer.h>\n #include <libcamera/property_ids.h>\n-#include <libcamera/request.h>\n #include <libcamera/stream.h>\n #include <libcamera/transform.h>\n \n@@ -45,6 +44,7 @@\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/media_pipeline.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/request.h\"\n #include \"libcamera/internal/v4l2_subdevice.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n #include \"libcamera/internal/yaml_parser.h\"\n@@ -507,7 +507,7 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta\n \tif (!info)\n \t\treturn;\n \n-\tinfo->request->metadata().merge(metadata);\n+\tinfo->request->_d()->metadata().merge(metadata);\n \tinfo->metadataProcessed = true;\n \n \tpipe()->tryCompleteRequest(info);\n@@ -1643,8 +1643,8 @@ 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\trequest->_d()->metadata().set(controls::SensorTimestamp,\n+\t\t\t\t\t metadata.timestamp);\n \n \t\tif (isRaw_) {\n \t\t\tconst ControlList &ctrls =\n@@ -1686,7 +1686,7 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n \t\treturn;\n \t}\n \n-\tdewarper_->populateMetadata(&data->mainPathStream_, request->metadata());\n+\tdewarper_->populateMetadata(&data->mainPathStream_, request->_d()->metadata());\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 9d65dc83573b88a4c8fd5410594085c21d91b1b1..7de45f4e5d0722a9b6425f01596455f838101900 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -1221,7 +1221,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+\trequest->_d()->metadata().merge(metadata);\n \n \t/*\n \t * Inform the sensor of the latest colour gains if it has the\n@@ -1492,9 +1492,9 @@ void CameraData::checkRequestCompleted()\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+\t\trequest->_d()->metadata().set(controls::SensorTimestamp, *x);\n \tif (auto x = bufferControls.get(controls::FrameWallClock))\n-\t\trequest->metadata().set(controls::FrameWallClock, *x);\n+\t\trequest->_d()->metadata().set(controls::FrameWallClock, *x);\n \n \tif (cropParams_.size()) {\n \t\tstd::vector<Rectangle> crops;\n@@ -1502,10 +1502,11 @@ 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\trequest->_d()->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\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 \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 15628259afc6a90511052e8ec463d4d1cad9b30b..7735d0a9ed4311d731b7ed9b01c5970fa5d2b381 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -15,7 +15,6 @@\n #include <vector>\n \n #include <libcamera/controls.h>\n-#include <libcamera/request.h>\n \n #include \"libcamera/internal/bayer_format.h\"\n #include \"libcamera/internal/camera.h\"\n@@ -25,6 +24,7 @@\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/media_object.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/request.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n #include \"libcamera/internal/yaml_parser.h\"\n \ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex a06a52926441ba826972b70bc8aef068e354d843..f58208f28149fef561b9bd00d5fab18b2dd8ef9b 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -27,7 +27,6 @@\n #include <libcamera/camera.h>\n #include <libcamera/color_space.h>\n #include <libcamera/control_ids.h>\n-#include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n #include \"libcamera/internal/camera.h\"\n@@ -41,6 +40,7 @@\n #include \"libcamera/internal/global_configuration.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/request.h\"\n #include \"libcamera/internal/software_isp/software_isp.h\"\n #include \"libcamera/internal/v4l2_subdevice.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n@@ -927,8 +927,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)\n \t}\n \n \tif (request)\n-\t\trequest->metadata().set(controls::SensorTimestamp,\n-\t\t\t\t\tbuffer->metadata().timestamp);\n+\t\trequest->_d()->metadata().set(controls::SensorTimestamp,\n+\t\t\t\t\t buffer->metadata().timestamp);\n \n \t/*\n \t * Queue the captured and the request buffer to the converter or Software\n@@ -1015,7 +1015,7 @@ void SimpleCameraData::metadataReady(uint32_t frame, const ControlList &metadata\n \tif (!info)\n \t\treturn;\n \n-\tinfo->request->metadata().merge(metadata);\n+\tinfo->request->_d()->metadata().merge(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 cb8cc82dffd551183fbeccd5041982b1d44e9f77..3bd51733d4005347c0bdfe83db0ea5f827be441e 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -24,13 +24,13 @@\n #include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n #include <libcamera/property_ids.h>\n-#include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/request.h\"\n #include \"libcamera/internal/sysfs.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n@@ -895,8 +895,8 @@ 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+\trequest->_d()->metadata().set(controls::SensorTimestamp,\n+\t\t\t\t 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 cd3370e3d41911f6935bead7f2d0dc5b39ee0038..4a03c149a61739d3596c11f91696db3ee5a43568 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -24,7 +24,6 @@\n #include <libcamera/formats.h>\n #include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n-#include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n #include <libcamera/ipa/ipa_interface.h>\n@@ -39,6 +38,7 @@\n #include \"libcamera/internal/ipa_manager.h\"\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/request.h\"\n #include \"libcamera/internal/v4l2_subdevice.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n@@ -618,8 +618,8 @@ 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+\trequest->_d()->metadata().set(controls::SensorTimestamp,\n+\t\t\t\t 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 7855e8b9db0c3bdfb3662a0b6e71332ed463a0ed..40c35264c5687c0f94458e19a272612cefb76285 100644\n--- a/src/libcamera/pipeline/virtual/virtual.cpp\n+++ b/src/libcamera/pipeline/virtual/virtual.cpp\n@@ -29,13 +29,13 @@\n #include <libcamera/formats.h>\n #include <libcamera/pixel_format.h>\n #include <libcamera/property_ids.h>\n-#include <libcamera/request.h>\n \n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/dma_buf_allocator.h\"\n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/request.h\"\n #include \"libcamera/internal/yaml_parser.h\"\n \n #include \"pipeline/virtual/config_parser.h\"\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->metadata().set(controls::SensorTimestamp, timestamp);\n+\trequest->_d()->metadata().set(controls::SensorTimestamp, timestamp);\n \tdata->invokeMethod(&VirtualCameraData::processRequest,\n \t\t\t ConnectionTypeQueued, request);\n \ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 2544a059f6984d930ec909c74e0b621c9fe82726..a661b2f5c8ae9ae2bcbab2dcdceeef7dcb8d0930 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -57,11 +57,16 @@ LOG_DEFINE_CATEGORY(Request)\n Request::Private::Private(Camera *camera)\n \t: camera_(camera), cancelled_(false)\n {\n+\t/**\n+\t * \\todo Add a validator for metadata controls.\n+\t */\n+\tmetadata_ = new ControlList(controls::controls);\n }\n \n Request::Private::~Private()\n {\n \tdoCancelRequest();\n+\tdelete metadata_;\n }\n \n /**\n@@ -82,6 +87,12 @@ bool Request::Private::hasPendingBuffers() const\n \treturn !pending_.empty();\n }\n \n+/**\n+ * \\fn Request::Private::metadata()\n+ * \\brief Retrieve the request's metadata\n+ * \\return The metadata associated with the request\n+ */\n+\n /**\n * \\brief Complete a buffer for the request\n * \\param[in] buffer The buffer that has completed\n@@ -359,11 +370,6 @@ Request::Request(Camera *camera, uint64_t cookie)\n \tcontrols_ = new ControlList(camera->controls(),\n \t\t\t\t camera->_d()->validator());\n \n-\t/**\n-\t * \\todo Add a validator for metadata controls.\n-\t */\n-\tmetadata_ = new ControlList(controls::controls);\n-\n \tLIBCAMERA_TRACEPOINT(request_construct, this);\n \n \tLOG(Request, Debug) << \"Created request - cookie: \" << cookie_;\n@@ -372,8 +378,6 @@ Request::Request(Camera *camera, uint64_t cookie)\n Request::~Request()\n {\n \tLIBCAMERA_TRACEPOINT(request_destroy, this);\n-\n-\tdelete metadata_;\n \tdelete controls_;\n }\n \n@@ -406,7 +410,7 @@ void Request::reuse(ReuseFlag flags)\n \tstatus_ = RequestPending;\n \n \tcontrols_->clear();\n-\tmetadata_->clear();\n+\t_d()->metadata_->clear();\n }\n \n /**\n@@ -425,6 +429,15 @@ void Request::reuse(ReuseFlag flags)\n * \\return A reference to the ControlList in this request\n */\n \n+/**\n+ * \\brief Retrieve the request's metadata\n+ * \\return The a const reference to the metadata associated with the request\n+ */\n+const ControlList &Request::metadata() const\n+{\n+\treturn *_d()->metadata_;\n+}\n+\n /**\n * \\fn Request::buffers()\n * \\brief Retrieve the request's streams to buffers map\n@@ -525,14 +538,6 @@ FrameBuffer *Request::findBuffer(const Stream *stream) const\n \treturn it->second;\n }\n \n-/**\n- * \\fn Request::metadata()\n- * \\brief Retrieve the request's metadata\n- * \\todo Offer a read-only API towards applications while keeping a read/write\n- * API internally.\n- * \\return The metadata associated with the request\n- */\n-\n /**\n * \\brief Retrieve the sequence number for the request\n *\n", "prefixes": [ "v3", "2/5" ] }