Patch Detail
Show a patch.
GET /api/patches/24925/?format=api
{ "id": 24925, "url": "https://patchwork.libcamera.org/api/patches/24925/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24925/", "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": "<20251030165816.1095180-23-barnabas.pocze@ideasonboard.com>", "date": "2025-10-30T16:58:16", "name": "[RFC,v3,22/22] libcamera: request: Swap the two metadata lists", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ebb70e3bcf44e1bda49809427efdfc10917fe76d", "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/24925/mbox/", "series": [ { "id": 5545, "url": "https://patchwork.libcamera.org/api/series/5545/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5545", "date": "2025-10-30T16:57:54", "name": "libcamera: Add `MetadataList`", "version": 3, "mbox": "https://patchwork.libcamera.org/series/5545/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24925/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24925/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 5E5DEC3332\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 30 Oct 2025 16:58:54 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E8AFD60A8B;\n\tThu, 30 Oct 2025 17:58:53 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 455D76098A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Oct 2025 17:58:28 +0100 (CET)", "from pb-laptop.local (185.221.140.239.nat.pool.zt.hu\n\t[185.221.140.239])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 215A61FDD;\n\tThu, 30 Oct 2025 17:56:38 +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=\"fOjgf7eQ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1761843398;\n\tbh=y4mYrZZXQMsWFG8Vn/9gkT5MaDcE8+MJM+S/ZFOFPFI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fOjgf7eQr+mfGftjJXy3rGvqdFvxNVAUt5rvqXwDd4DlAy9/oiNa+LDG/nBRDclWf\n\t2oiz0XhIYdlbH/HA6gqNr2iMXFSyyFhe/lN5TyPVBQ8dzpzi6dFoI2tz7dk10wot52\n\tWazFqs7DUe0ypbbAgmIImsT3kHcJFZ+yaSh4Q9AU=", "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>", "Subject": "[RFC PATCH v3 22/22] libcamera: request: Swap the two metadata lists", "Date": "Thu, 30 Oct 2025 17:58:16 +0100", "Message-ID": "<20251030165816.1095180-23-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.51.1", "In-Reply-To": "<20251030165816.1095180-1-barnabas.pocze@ideasonboard.com>", "References": "<20251030165816.1095180-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": "Swap `metadata_` and `metadata2_`, so `MetadataList` is used as the primary\nmetadata list of a request.\n\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n include/libcamera/internal/pipeline_handler.h | 10 +++++-----\n include/libcamera/request.h | 8 ++++----\n src/android/camera_device.cpp | 2 +-\n src/apps/cam/camera_session.cpp | 7 +++----\n src/apps/cam/file_sink.cpp | 2 +-\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 | 2 +-\n src/apps/qcam/main_window.h | 3 ++-\n src/gstreamer/gstlibcamera-controls.cpp.in | 4 ++--\n src/libcamera/pipeline_handler.cpp | 4 ++--\n src/libcamera/request.cpp | 10 +++++-----\n src/py/libcamera/py_helpers.cpp | 4 ++--\n src/py/libcamera/py_helpers.h | 2 +-\n src/py/libcamera/py_main.cpp | 2 +-\n 16 files changed, 35 insertions(+), 35 deletions(-)", "diff": "diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 6c0e546e67..1803b9bbcf 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -69,11 +69,11 @@ public:\n \tvoid metadataAvailable(Request *request, const Control<T> &ctrl,\n \t\t\t const internal::cxx20::type_identity_t<T> &value)\n \t{\n-\t\tauto &m = request->metadata2();\n+\t\tauto &m = request->metadata();\n \t\tconst auto c = m.checkpoint();\n \n \t\tstd::ignore = m.set(ctrl, value);\n-\t\trequest->metadata().set(ctrl, value);\n+\t\trequest->metadata2().set(ctrl, value);\n \n \t\tconst auto d = c.diffSince();\n \t\tif (d)\n@@ -88,8 +88,8 @@ public:\n \t\tvoid operator()(const Control<T> &ctrl,\n \t\t\t const internal::cxx20::type_identity_t<T> &value) const\n \t\t{\n-\t\t\trequest->metadata().set(ctrl, value);\n-\t\t\tstd::ignore = request->metadata2().set(ctrl, value);\n+\t\t\tstd::ignore = request->metadata().set(ctrl, value);\n+\t\t\trequest->metadata2().set(ctrl, value);\n \t\t}\n \t};\n \n@@ -99,7 +99,7 @@ public:\n #endif\n \tvoid metadataAvailable(Request *request, Func func)\n \t{\n-\t\tconst auto c = request->metadata2().checkpoint();\n+\t\tconst auto c = request->metadata().checkpoint();\n \n \t\tstd::invoke(func, MetadataSetter{ request });\n \ndiff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex 23e7bde72c..6e7057c1d5 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -51,9 +51,9 @@ public:\n \tvoid reuse(ReuseFlag flags = Default);\n \n \tControlList &controls() { return *controls_; }\n-\tControlList &metadata() { return *metadata_; }\n+\t[[nodiscard]] MetadataList &metadata() { return metadata_; }\n #ifndef __DOXYGEN__\n-\t[[nodiscard]] MetadataList &metadata2() { return metadata2_; }\n+\tControlList &metadata2() { return *metadata2_; }\n #endif\n \tconst BufferMap &buffers() const { return bufferMap_; }\n \tint addBuffer(const Stream *stream, FrameBuffer *buffer,\n@@ -72,8 +72,8 @@ private:\n \tLIBCAMERA_DISABLE_COPY(Request)\n \n \tControlList *controls_;\n-\tControlList *metadata_;\n-\tMetadataList metadata2_;\n+\tMetadataList metadata_;\n+\tControlList *metadata2_;\n \tBufferMap bufferMap_;\n \n \tconst uint64_t cookie_;\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 80ff248c2a..fa0cf1d236 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1423,7 +1423,7 @@ void CameraDevice::notifyError(uint32_t frameNumber, camera3_stream_t *stream,\n std::unique_ptr<CameraMetadata>\n CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) const\n {\n-\tconst ControlList &metadata = descriptor.request_->metadata();\n+\tconst MetadataList &metadata = descriptor.request_->metadata();\n \tconst CameraMetadata &settings = descriptor.settings_;\n \tcamera_metadata_ro_entry_t entry;\n \tbool found;\ndiff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\nindex 7cd8772e0a..9c5ce97f43 100644\n--- a/src/apps/cam/camera_session.cpp\n+++ b/src/apps/cam/camera_session.cpp\n@@ -545,19 +545,18 @@ void CameraSession::processRequest(Request *request)\n \tstd::cout << info.str() << std::endl;\n \n \tif (printMetadata_) {\n-\t\tconst ControlList &requestMetadata = request->metadata();\n+\t\tconst MetadataList &requestMetadata = request->metadata();\n \t\tstd::cout << \"Metadata (\" << requestMetadata.size() << \" entries):\\n\";\n \t\tfor (const auto &[key, value] : requestMetadata) {\n \t\t\tconst ControlId *id = controls::controls.at(key);\n-\t\t\tstd::cout << \"\\t\" << id->name() << \" = \"\n-\t\t\t\t << value.toString() << std::endl;\n+\t\t\tstd::cout << '\\t' << id->name() << \" = \" << value << std::endl;\n \t\t}\n \n \t\tconst auto &requestMetadata2 = request->metadata2();\n \t\tstd::cout << \"Metadata2 (\" << requestMetadata2.size() << \" entries):\\n\";\n \t\tfor (const auto &[key, value] : requestMetadata2) {\n \t\t\tconst ControlId *id = controls::controls.at(key);\n-\t\t\tstd::cout << '\\t' << id->name() << \" = \" << value << std::endl;\n+\t\t\tstd::cout << '\\t' << id->name() << \" = \" << value.toString() << std::endl;\n \t\t}\n \t}\n \ndiff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp\nindex 65794a2f90..7149d782cc 100644\n--- a/src/apps/cam/file_sink.cpp\n+++ b/src/apps/cam/file_sink.cpp\n@@ -102,7 +102,7 @@ bool FileSink::processRequest(Request *request)\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 26cd61b36d..1f973f2e61 100644\n--- a/src/apps/cam/file_sink.h\n+++ b/src/apps/cam/file_sink.h\n@@ -11,7 +11,7 @@\n #include <memory>\n #include <string>\n \n-#include <libcamera/controls.h>\n+#include <libcamera/metadata_list.h>\n #include <libcamera/stream.h>\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 8d57023e1e..4319795643 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<PixelFormat, FormatInfo> 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 aaa8a852b3..741f78a75b 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 <libcamera/camera.h>\n-#include <libcamera/controls.h>\n #include <libcamera/framebuffer.h>\n+#include <libcamera/metadata_list.h>\n #include <libcamera/stream.h>\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 96a2d50901..2a678c19aa 100644\n--- a/src/apps/qcam/main_window.cpp\n+++ b/src/apps/qcam/main_window.cpp\n@@ -646,7 +646,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);\ndiff --git a/src/apps/qcam/main_window.h b/src/apps/qcam/main_window.h\nindex 81fcf915ad..278de1d449 100644\n--- a/src/apps/qcam/main_window.h\n+++ b/src/apps/qcam/main_window.h\n@@ -15,6 +15,7 @@\n #include <libcamera/controls.h>\n #include <libcamera/framebuffer.h>\n #include <libcamera/framebuffer_allocator.h>\n+#include <libcamera/metadata_list.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \n@@ -66,7 +67,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 6faf3ee7a6..b42eade9b8 100644\n--- a/src/gstreamer/gstlibcamera-controls.cpp.in\n+++ b/src/gstreamer/gstlibcamera-controls.cpp.in\n@@ -282,6 +282,6 @@ void GstCameraControls::applyControls(std::unique_ptr<libcamera::Request> &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->metadata())\n+\t\tcontrols_acc_.set(k, ControlValue(v));\n }\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex a3a37de873..ae81cfa4d5 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -559,9 +559,9 @@ void PipelineHandler::doQueueRequests(Camera *camera)\n */\n void PipelineHandler::metadataAvailable(Request *request, const ControlList &metadata)\n {\n-\trequest->metadata().merge(metadata);\n+\trequest->metadata2().merge(metadata);\n \n-\tconst auto d = request->metadata2().merge(metadata);\n+\tconst auto d = request->metadata().merge(metadata);\n \tif (!d)\n \t\tLOG(Pipeline, Fatal) << \"Tried to add incompatible metadata items\";\n \ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 0ff465e6f7..8e272eeece 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -357,7 +357,7 @@ void Request::Private::timeout()\n */\n Request::Request(Camera *camera, uint64_t cookie)\n \t: Extensible(std::make_unique<Private>(camera)),\n-\t metadata2_(camera->_d()->metadataPlan_),\n+\t metadata_(camera->_d()->metadataPlan_),\n \t cookie_(cookie), status_(RequestPending)\n {\n \tcontrols_ = new ControlList(controls::controls,\n@@ -366,7 +366,7 @@ Request::Request(Camera *camera, uint64_t cookie)\n \t/**\n \t * \\todo Add a validator for metadata controls.\n \t */\n-\tmetadata_ = new ControlList(controls::controls);\n+\tmetadata2_ = new ControlList(controls::controls);\n \n \tLIBCAMERA_TRACEPOINT(request_construct, this);\n \n@@ -377,7 +377,7 @@ Request::~Request()\n {\n \tLIBCAMERA_TRACEPOINT(request_destroy, this);\n \n-\tdelete metadata_;\n+\tdelete metadata2_;\n \tdelete controls_;\n }\n \n@@ -410,8 +410,8 @@ void Request::reuse(ReuseFlag flags)\n \tstatus_ = RequestPending;\n \n \tcontrols_->clear();\n-\tmetadata_->clear();\n-\tmetadata2_.clear();\n+\tmetadata_.clear();\n+\tmetadata2_->clear();\n }\n \n /**\ndiff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp\nindex 8c55ef8458..a994c90b70 100644\n--- a/src/py/libcamera/py_helpers.cpp\n+++ b/src/py/libcamera/py_helpers.cpp\n@@ -16,7 +16,7 @@ namespace py = pybind11;\n using namespace libcamera;\n \n template<typename T>\n-static py::object valueOrTuple(const ControlValue &cv)\n+static py::object valueOrTuple(const ControlValueView &cv)\n {\n \tif (cv.isArray()) {\n \t\tconst T *v = reinterpret_cast<const T *>(cv.data().data());\n@@ -31,7 +31,7 @@ static py::object valueOrTuple(const ControlValue &cv)\n \treturn py::cast(cv.get<T>());\n }\n \n-py::object controlValueToPy(const ControlValue &cv)\n+py::object controlValueToPy(const ControlValueView &cv)\n {\n \tswitch (cv.type()) {\n \tcase ControlTypeNone:\ndiff --git a/src/py/libcamera/py_helpers.h b/src/py/libcamera/py_helpers.h\nindex 983969dfff..895006d0c0 100644\n--- a/src/py/libcamera/py_helpers.h\n+++ b/src/py/libcamera/py_helpers.h\n@@ -9,5 +9,5 @@\n \n #include <pybind11/pybind11.h>\n \n-pybind11::object controlValueToPy(const libcamera::ControlValue &cv);\n+pybind11::object controlValueToPy(const libcamera::ControlValueView &cv);\n libcamera::ControlValue pyToControlValue(const pybind11::object &ob, libcamera::ControlType type);\ndiff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\nindex a983ea75c3..77e0ead68a 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -466,7 +466,7 @@ PYBIND11_MODULE(_libcamera, m)\n \t\t\tself.controls().set(id.id(), pyToControlValue(value, id.type()));\n \t\t})\n \t\t.def_property_readonly(\"metadata\", [](Request &self) {\n-\t\t\t/* Convert ControlList to std container */\n+\t\t\t/* Convert MetadataList to std container */\n \n \t\t\tstd::unordered_map<const ControlId *, py::object> ret;\n \n", "prefixes": [ "RFC", "v3", "22/22" ] }