{"id":23503,"url":"https://patchwork.libcamera.org/api/patches/23503/?format=json","web_url":"https://patchwork.libcamera.org/patch/23503/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","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-24-barnabas.pocze@ideasonboard.com>","date":"2025-06-06T16:41:56","name":"[RFC,v1,23/23] treewide: Use `Request::metadata2()`","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4d2faef4488b5f4b9b77c407ef7a7cb53c53c061","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23503/mbox/","series":[{"id":5210,"url":"https://patchwork.libcamera.org/api/series/5210/?format=json","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/23503/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23503/checks/","tags":{},"headers":{"Return-Path":"","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 56C22C3331\n\tfor ;\n\tFri, 6 Jun 2025 16:42:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B5DD368DE6;\n\tFri, 6 Jun 2025 18:42:55 +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 5C5C768DD6\n\tfor ;\n\tFri, 6 Jun 2025 18:42:21 +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 DD2A98DB\n\tfor ;\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=\"fzBfkdQ0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1749228137;\n\tbh=+Lvbk24NSO+srL5gi1SABT81HvDAXG4rQKskNZJQn9Q=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=fzBfkdQ0R/MhucPL91czFSIJ1vkibi7ITcM7lsqAI8PZrhWSCYwbv+5BewuzEWS9c\n\tiGqJt6rBkmlcBSuh/yrmDloZSMDdInX+1SBIWFMe5n4FE62XL2zxRsoZM1od2Maoin\n\t3O42kFD2Y7gTp1CqdXoeWuDuQaUbE9Q/Gg4ufYNw=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Subject":"[RFC PATCH v1 23/23] treewide: Use `Request::metadata2()`","Date":"Fri, 6 Jun 2025 18:41:56 +0200","Message-ID":"<20250606164156.1442682-24-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Apart from a few exceptions, make everything use the new metadata list\nof a request to access metadata items. After this change the only\nthing remaining is to remove the exceptional uses, remove `Request::metadata()`\naltogether, and finally rename `Request::metadata2()`.\n\nSigned-off-by: Barnabás Pőcze \n---\n src/android/camera_device.cpp | 4 ++--\n src/apps/cam/file_sink.cpp | 4 ++--\n src/apps/cam/file_sink.h | 4 ++--\n src/apps/common/dng_writer.cpp | 2 +-\n src/apps/common/dng_writer.h | 4 ++--\n src/apps/qcam/main_window.cpp | 4 ++--\n src/apps/qcam/main_window.h | 4 ++--\n src/gstreamer/gstlibcamera-controls.cpp.in | 4 ++--\n src/gstreamer/gstlibcamerasrc.cpp | 2 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 2 +-\n 10 files changed, 17 insertions(+), 17 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 80ff248c2..b8c6ddf84 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1187,7 +1187,7 @@ void CameraDevice::requestComplete(Request *request)\n \t * \\todo The shutter event notification should be sent to the framework\n \t * as soon as possible, earlier than request completion time.\n \t */\n-\tuint64_t sensorTimestamp = static_cast(request->metadata()\n+\tuint64_t sensorTimestamp = static_cast(request->metadata2()\n \t\t\t\t\t\t\t\t .get(controls::SensorTimestamp)\n \t\t\t\t\t\t\t\t .value_or(0));\n \tnotifyShutter(descriptor->frameNumber_, sensorTimestamp);\n@@ -1423,7 +1423,7 @@ void CameraDevice::notifyError(uint32_t frameNumber, camera3_stream_t *stream,\n std::unique_ptr\n CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) const\n {\n-\tconst ControlList &metadata = descriptor.request_->metadata();\n+\tconst MetadataList &metadata = descriptor.request_->metadata2();\n \tconst CameraMetadata &settings = descriptor.settings_;\n \tcamera_metadata_ro_entry_t entry;\n \tbool found;\ndiff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp\nindex 65794a2f9..1cc1b2b12 100644\n--- a/src/apps/cam/file_sink.cpp\n+++ b/src/apps/cam/file_sink.cpp\n@@ -96,13 +96,13 @@ void FileSink::mapBuffer(FrameBuffer *buffer)\n bool FileSink::processRequest(Request *request)\n {\n \tfor (auto [stream, buffer] : request->buffers())\n-\t\twriteBuffer(stream, buffer, request->metadata());\n+\t\twriteBuffer(stream, buffer, request->metadata2());\n \n \treturn true;\n }\n \n void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer,\n-\t\t\t [[maybe_unused]] const ControlList &metadata)\n+\t\t\t [[maybe_unused]] const MetadataList &metadata)\n {\n \tstd::string filename = pattern_;\n \tsize_t pos;\ndiff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h\nindex 26cd61b36..1f973f2e6 100644\n--- a/src/apps/cam/file_sink.h\n+++ b/src/apps/cam/file_sink.h\n@@ -11,7 +11,7 @@\n #include \n #include \n \n-#include \n+#include \n #include \n \n #include \"frame_sink.h\"\n@@ -44,7 +44,7 @@ private:\n \n \tvoid writeBuffer(const libcamera::Stream *stream,\n \t\t\t libcamera::FrameBuffer *buffer,\n-\t\t\t const libcamera::ControlList &metadata);\n+\t\t\t const libcamera::MetadataList &metadata);\n \n #ifdef HAVE_TIFF\n \tconst libcamera::Camera *camera_;\ndiff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp\nindex ac4619511..d8884548c 100644\n--- a/src/apps/common/dng_writer.cpp\n+++ b/src/apps/common/dng_writer.cpp\n@@ -521,7 +521,7 @@ const std::map formatInfo = {\n \n int DNGWriter::write(const char *filename, const Camera *camera,\n \t\t const StreamConfiguration &config,\n-\t\t const ControlList &metadata,\n+\t\t const MetadataList &metadata,\n \t\t [[maybe_unused]] const FrameBuffer *buffer,\n \t\t const void *data)\n {\ndiff --git a/src/apps/common/dng_writer.h b/src/apps/common/dng_writer.h\nindex aaa8a852b..741f78a75 100644\n--- a/src/apps/common/dng_writer.h\n+++ b/src/apps/common/dng_writer.h\n@@ -10,8 +10,8 @@\n #ifdef HAVE_TIFF\n \n #include \n-#include \n #include \n+#include \n #include \n \n class DNGWriter\n@@ -19,7 +19,7 @@ class DNGWriter\n public:\n \tstatic int write(const char *filename, const libcamera::Camera *camera,\n \t\t\t const libcamera::StreamConfiguration &config,\n-\t\t\t const libcamera::ControlList &metadata,\n+\t\t\t const libcamera::MetadataList &metadata,\n \t\t\t const libcamera::FrameBuffer *buffer, const void *data);\n };\n \ndiff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\nindex 7e3f3da60..46dfbb198 100644\n--- a/src/apps/qcam/main_window.cpp\n+++ b/src/apps/qcam/main_window.cpp\n@@ -643,7 +643,7 @@ void MainWindow::captureRaw()\n }\n \n void MainWindow::processRaw(FrameBuffer *buffer,\n-\t\t\t [[maybe_unused]] const ControlList &metadata)\n+\t\t\t [[maybe_unused]] const MetadataList &metadata)\n {\n #ifdef HAVE_TIFF\n \tQString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);\n@@ -707,7 +707,7 @@ void MainWindow::processCapture()\n \t\tprocessViewfinder(request->buffers().at(vfStream_));\n \n \tif (request->buffers().count(rawStream_))\n-\t\tprocessRaw(request->buffers().at(rawStream_), request->metadata());\n+\t\tprocessRaw(request->buffers().at(rawStream_), request->metadata2());\n \n \trequest->reuse();\n \tQMutexLocker locker(&mutex_);\ndiff --git a/src/apps/qcam/main_window.h b/src/apps/qcam/main_window.h\nindex 81fcf915a..eb1e4ce58 100644\n--- a/src/apps/qcam/main_window.h\n+++ b/src/apps/qcam/main_window.h\n@@ -12,9 +12,9 @@\n \n #include \n #include \n-#include \n #include \n #include \n+#include \n #include \n #include \n \n@@ -66,7 +66,7 @@ private Q_SLOTS:\n \tvoid saveImageAs();\n \tvoid captureRaw();\n \tvoid processRaw(libcamera::FrameBuffer *buffer,\n-\t\t\tconst libcamera::ControlList &metadata);\n+\t\t\tconst libcamera::MetadataList &metadata);\n \n \tvoid renderComplete(libcamera::FrameBuffer *buffer);\n \ndiff --git a/src/gstreamer/gstlibcamera-controls.cpp.in b/src/gstreamer/gstlibcamera-controls.cpp.in\nindex 89c530da0..f5bd2885c 100644\n--- a/src/gstreamer/gstlibcamera-controls.cpp.in\n+++ b/src/gstreamer/gstlibcamera-controls.cpp.in\n@@ -322,6 +322,6 @@ void GstCameraControls::applyControls(std::unique_ptr &reque\n \n void GstCameraControls::readMetadata(libcamera::Request *request)\n {\n-\tcontrols_acc_.merge(request->metadata(),\n-\t\t\t ControlList::MergePolicy::OverwriteExisting);\n+\tfor (const auto &[k, v] : request->metadata2())\n+\t\tcontrols_acc_.set(k, ControlValue(v));\n }\ndiff --git a/src/gstreamer/gstlibcamerasrc.cpp b/src/gstreamer/gstlibcamerasrc.cpp\nindex b34f08977..5b570e86f 100644\n--- a/src/gstreamer/gstlibcamerasrc.cpp\n+++ b/src/gstreamer/gstlibcamerasrc.cpp\n@@ -247,7 +247,7 @@ GstLibcameraSrcState::requestCompleted(Request *request)\n \t}\n \n \tif (GST_ELEMENT_CLOCK(src_)) {\n-\t\tint64_t timestamp = request->metadata().get(controls::SensorTimestamp).value_or(0);\n+\t\tint64_t timestamp = request->metadata2().get(controls::SensorTimestamp).value_or(0);\n \n \t\tGstClockTime gst_base_time = GST_ELEMENT(src_)->base_time;\n \t\tGstClockTime gst_now = gst_clock_get_time(GST_ELEMENT_CLOCK(src_));\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 0f59d0727..5bc8b5ed8 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -1375,7 +1375,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n \t\treturn;\n \t}\n \n-\tipa_->processStats(info->id, request->metadata().get(controls::SensorTimestamp).value_or(0),\n+\tipa_->processStats(info->id, request->metadata2().get(controls::SensorTimestamp).value_or(0),\n \t\t\t info->statBuffer->cookie(), info->effectiveSensorControls);\n }\n \n","prefixes":["RFC","v1","23/23"]}