[{"id":35195,"web_url":"https://patchwork.libcamera.org/comment/35195/","msgid":"","date":"2025-07-28T12:03:39","subject":"Re: [RFC PATCH v2 22/22] libcamera: request: Swap the two metadata\n\tlists","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"I'll be happy to see this, it's a huge API break indeed though\n\nReviewed-by: Jacopo Mondi \n\nOn Mon, Jul 21, 2025 at 12:46:22PM +0200, Barnabás Pőcze wrote:\n> Swap `metadata_` and `metadata2_`, so `MetadataList` is used as the primary\n> metadata list of a request.\n>\n> Signed-off-by: Barnabás Pőcze \n> ---\n> include/libcamera/internal/pipeline_handler.h | 6 +++---\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, 33 insertions(+), 33 deletions(-)\n>\n> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\n> index 49c907178..8fe20c544 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 &ctrl,\n> \t\t\t const details::cxx20::type_identity_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\tm.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> @@ -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>\n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index 196557865..a41869473 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_;\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 80ff248c2..fa0cf1d23 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\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;\n> diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\n> index 16c735ef4..deec09be3 100644\n> --- a/src/apps/cam/camera_session.cpp\n> +++ b/src/apps/cam/camera_session.cpp\n> @@ -534,19 +534,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>\n> diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp\n> index 65794a2f9..7149d782c 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;\n> diff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h\n> index 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_;\n> diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp\n> index 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> {\n> diff --git a/src/apps/common/dng_writer.h b/src/apps/common/dng_writer.h\n> index 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>\n> diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\n> index 7e3f3da60..95d545f7c 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> diff --git a/src/apps/qcam/main_window.h b/src/apps/qcam/main_window.h\n> index 81fcf915a..278de1d44 100644\n> --- a/src/apps/qcam/main_window.h\n> +++ b/src/apps/qcam/main_window.h\n> @@ -15,6 +15,7 @@\n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \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>\n> diff --git a/src/gstreamer/gstlibcamera-controls.cpp.in b/src/gstreamer/gstlibcamera-controls.cpp.in\n> index 2a16b39a9..6a2a989a3 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->metadata())\n> +\t\tcontrols_acc_.set(k, ControlValue(v));\n> }\n> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> index c8ac7a673..ce538aa7c 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\trequest->_d()->camera()->metadataAvailable.emit(request, d);\n> }\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index 17ca67d08..4681eb960 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -354,7 +354,7 @@ void Request::Private::timeout()\n> */\n> Request::Request(Camera *camera, uint64_t cookie)\n> \t: Extensible(std::make_unique(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> @@ -363,7 +363,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> @@ -374,7 +374,7 @@ Request::~Request()\n> {\n> \tLIBCAMERA_TRACEPOINT(request_destroy, this);\n>\n> -\tdelete metadata_;\n> +\tdelete metadata2_;\n> \tdelete controls_;\n> }\n>\n> @@ -407,8 +407,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> /**\n> diff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp\n> index 1ad1d4c1a..32f5cdaa6 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\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(cv.data().data());\n> @@ -31,7 +31,7 @@ static py::object valueOrTuple(const ControlValue &cv)\n> \treturn py::cast(cv.get());\n> }\n>\n> -py::object controlValueToPy(const ControlValue &cv)\n> +py::object controlValueToPy(const ControlValueView &cv)\n> {\n> \tswitch (cv.type()) {\n> \tcase ControlTypeNone:\n> diff --git a/src/py/libcamera/py_helpers.h b/src/py/libcamera/py_helpers.h\n> index 983969dff..895006d0c 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 \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);\n> diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\n> index 441a70ab4..eb47f9dd3 100644\n> --- a/src/py/libcamera/py_main.cpp\n> +++ b/src/py/libcamera/py_main.cpp\n> @@ -460,7 +460,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 ret;\n>\n> --\n> 2.50.1\n>","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 09644BDCC1\n\tfor ;\n\tMon, 28 Jul 2025 12:03:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CEFFA69164;\n\tMon, 28 Jul 2025 14:03:45 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E312769158\n\tfor ;\n\tMon, 28 Jul 2025 14:03:43 +0200 (CEST)","from ideasonboard.com (mob-5-90-139-29.net.vodafone.it\n\t[5.90.139.29])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 867AC446;\n\tMon, 28 Jul 2025 14:03: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=\"AvHhyvpU\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1753704181;\n\tbh=O5zPNwZzj+wjKCSJ1wmui4mN3g8kxsaJ8tEeUq22Jy8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=AvHhyvpUDl4i8ROt+7lGBadiTUKE1BEhgtwgMGpa9A/iwmOfFJO57TqS9x0RZglig\n\tXR9TuYlZm0KF64YcSCXpO8X7Qt1BsHciyd4KAV2dqWDVUJrwcCDVX/mFPIMwzO2qv9\n\tDj++ESzBz9SaxtLLE+ccOWLto50ngX2pvIx8g2b8=","Date":"Mon, 28 Jul 2025 14:03:39 +0200","From":"Jacopo Mondi ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [RFC PATCH v2 22/22] libcamera: request: Swap the two metadata\n\tlists","Message-ID":"","References":"<20250721104622.1550908-1-barnabas.pocze@ideasonboard.com>\n\t<20250721104622.1550908-23-barnabas.pocze@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20250721104622.1550908-23-barnabas.pocze@ideasonboard.com>","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\" "}},{"id":35894,"web_url":"https://patchwork.libcamera.org/comment/35894/","msgid":"<175820110914.2127323.7427012667303858373@neptunite.rasen.tech>","date":"2025-09-18T13:11:49","subject":"Re: [RFC PATCH v2 22/22] libcamera: request: Swap the two metadata\n\tlists","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Quoting Barnabás Pőcze (2025-07-21 19:46:22)\n> Swap `metadata_` and `metadata2_`, so `MetadataList` is used as the primary\n> metadata list of a request.\n> \n> Signed-off-by: Barnabás Pőcze \n\nLooks good to me.\n\nReviewed-by: Paul Elder \n\n> ---\n> include/libcamera/internal/pipeline_handler.h | 6 +++---\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, 33 insertions(+), 33 deletions(-)\n> \n> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\n> index 49c907178..8fe20c544 100644\n> --- a/include/libcamera/internal/pipeline_handler.h\n> +++ b/include/libcamera/internal/pipeline_handler.h\n> @@ -69,11 +69,11 @@ public:\n> void metadataAvailable(Request *request, const Control &ctrl,\n> const details::cxx20::type_identity_t &value)\n> {\n> - auto &m = request->metadata2();\n> + auto &m = request->metadata();\n> const auto c = m.checkpoint();\n> \n> m.set(ctrl, value);\n> - request->metadata().set(ctrl, value);\n> + request->metadata2().set(ctrl, value);\n> \n> const auto d = c.diffSince();\n> if (d)\n> @@ -99,7 +99,7 @@ public:\n> #endif\n> void metadataAvailable(Request *request, Func func)\n> {\n> - const auto c = request->metadata2().checkpoint();\n> + const auto c = request->metadata().checkpoint();\n> \n> std::invoke(func, MetadataSetter{ request });\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index 196557865..a41869473 100644\n> --- a/include/libcamera/request.h\n> +++ b/include/libcamera/request.h\n> @@ -51,9 +51,9 @@ public:\n> void reuse(ReuseFlag flags = Default);\n> \n> ControlList &controls() { return *controls_; }\n> - ControlList &metadata() { return *metadata_; }\n> + [[nodiscard]] MetadataList &metadata() { return metadata_; }\n> #ifndef __DOXYGEN__\n> - [[nodiscard]] MetadataList &metadata2() { return metadata2_; }\n> + ControlList &metadata2() { return *metadata2_; }\n> #endif\n> const BufferMap &buffers() const { return bufferMap_; }\n> int addBuffer(const Stream *stream, FrameBuffer *buffer,\n> @@ -72,8 +72,8 @@ private:\n> LIBCAMERA_DISABLE_COPY(Request)\n> \n> ControlList *controls_;\n> - ControlList *metadata_;\n> - MetadataList metadata2_;\n> + MetadataList metadata_;\n> + ControlList *metadata2_;\n> BufferMap bufferMap_;\n> \n> const uint64_t cookie_;\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 80ff248c2..fa0cf1d23 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\n> CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) const\n> {\n> - const ControlList &metadata = descriptor.request_->metadata();\n> + const MetadataList &metadata = descriptor.request_->metadata();\n> const CameraMetadata &settings = descriptor.settings_;\n> camera_metadata_ro_entry_t entry;\n> bool found;\n> diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\n> index 16c735ef4..deec09be3 100644\n> --- a/src/apps/cam/camera_session.cpp\n> +++ b/src/apps/cam/camera_session.cpp\n> @@ -534,19 +534,18 @@ void CameraSession::processRequest(Request *request)\n> std::cout << info.str() << std::endl;\n> \n> if (printMetadata_) {\n> - const ControlList &requestMetadata = request->metadata();\n> + const MetadataList &requestMetadata = request->metadata();\n> std::cout << \"Metadata (\" << requestMetadata.size() << \" entries):\\n\";\n> for (const auto &[key, value] : requestMetadata) {\n> const ControlId *id = controls::controls.at(key);\n> - std::cout << \"\\t\" << id->name() << \" = \"\n> - << value.toString() << std::endl;\n> + std::cout << '\\t' << id->name() << \" = \" << value << std::endl;\n> }\n> \n> const auto &requestMetadata2 = request->metadata2();\n> std::cout << \"Metadata2 (\" << requestMetadata2.size() << \" entries):\\n\";\n> for (const auto &[key, value] : requestMetadata2) {\n> const ControlId *id = controls::controls.at(key);\n> - std::cout << '\\t' << id->name() << \" = \" << value << std::endl;\n> + std::cout << '\\t' << id->name() << \" = \" << value.toString() << std::endl;\n> }\n> }\n> \n> diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp\n> index 65794a2f9..7149d782c 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> - [[maybe_unused]] const ControlList &metadata)\n> + [[maybe_unused]] const MetadataList &metadata)\n> {\n> std::string filename = pattern_;\n> size_t pos;\n> diff --git a/src/apps/cam/file_sink.h b/src/apps/cam/file_sink.h\n> index 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> void writeBuffer(const libcamera::Stream *stream,\n> libcamera::FrameBuffer *buffer,\n> - const libcamera::ControlList &metadata);\n> + const libcamera::MetadataList &metadata);\n> \n> #ifdef HAVE_TIFF\n> const libcamera::Camera *camera_;\n> diff --git a/src/apps/common/dng_writer.cpp b/src/apps/common/dng_writer.cpp\n> index 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> const StreamConfiguration &config,\n> - const ControlList &metadata,\n> + const MetadataList &metadata,\n> [[maybe_unused]] const FrameBuffer *buffer,\n> const void *data)\n> {\n> diff --git a/src/apps/common/dng_writer.h b/src/apps/common/dng_writer.h\n> index 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> static int write(const char *filename, const libcamera::Camera *camera,\n> const libcamera::StreamConfiguration &config,\n> - const libcamera::ControlList &metadata,\n> + const libcamera::MetadataList &metadata,\n> const libcamera::FrameBuffer *buffer, const void *data);\n> };\n> \n> diff --git a/src/apps/qcam/main_window.cpp b/src/apps/qcam/main_window.cpp\n> index 7e3f3da60..95d545f7c 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> - [[maybe_unused]] const ControlList &metadata)\n> + [[maybe_unused]] const MetadataList &metadata)\n> {\n> #ifdef HAVE_TIFF\n> QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);\n> diff --git a/src/apps/qcam/main_window.h b/src/apps/qcam/main_window.h\n> index 81fcf915a..278de1d44 100644\n> --- a/src/apps/qcam/main_window.h\n> +++ b/src/apps/qcam/main_window.h\n> @@ -15,6 +15,7 @@\n> #include \n> #include \n> #include \n> +#include \n> #include \n> #include \n> \n> @@ -66,7 +67,7 @@ private Q_SLOTS:\n> void saveImageAs();\n> void captureRaw();\n> void processRaw(libcamera::FrameBuffer *buffer,\n> - const libcamera::ControlList &metadata);\n> + const libcamera::MetadataList &metadata);\n> \n> void renderComplete(libcamera::FrameBuffer *buffer);\n> \n> diff --git a/src/gstreamer/gstlibcamera-controls.cpp.in b/src/gstreamer/gstlibcamera-controls.cpp.in\n> index 2a16b39a9..6a2a989a3 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> - controls_acc_.merge(request->metadata(),\n> - ControlList::MergePolicy::OverwriteExisting);\n> + for (const auto &[k, v] : request->metadata())\n> + controls_acc_.set(k, ControlValue(v));\n> }\n> diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\n> index c8ac7a673..ce538aa7c 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> - request->metadata().merge(metadata);\n> + request->metadata2().merge(metadata);\n> \n> - const auto d = request->metadata2().merge(metadata);\n> + const auto d = request->metadata().merge(metadata);\n> if (d)\n> request->_d()->camera()->metadataAvailable.emit(request, d);\n> }\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index 17ca67d08..4681eb960 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -354,7 +354,7 @@ void Request::Private::timeout()\n> */\n> Request::Request(Camera *camera, uint64_t cookie)\n> : Extensible(std::make_unique(camera)),\n> - metadata2_(camera->_d()->metadataPlan_),\n> + metadata_(camera->_d()->metadataPlan_),\n> cookie_(cookie), status_(RequestPending)\n> {\n> controls_ = new ControlList(controls::controls,\n> @@ -363,7 +363,7 @@ Request::Request(Camera *camera, uint64_t cookie)\n> /**\n> * \\todo Add a validator for metadata controls.\n> */\n> - metadata_ = new ControlList(controls::controls);\n> + metadata2_ = new ControlList(controls::controls);\n> \n> LIBCAMERA_TRACEPOINT(request_construct, this);\n> \n> @@ -374,7 +374,7 @@ Request::~Request()\n> {\n> LIBCAMERA_TRACEPOINT(request_destroy, this);\n> \n> - delete metadata_;\n> + delete metadata2_;\n> delete controls_;\n> }\n> \n> @@ -407,8 +407,8 @@ void Request::reuse(ReuseFlag flags)\n> status_ = RequestPending;\n> \n> controls_->clear();\n> - metadata_->clear();\n> - metadata2_.clear();\n> + metadata_.clear();\n> + metadata2_->clear();\n> }\n> \n> /**\n> diff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp\n> index 1ad1d4c1a..32f5cdaa6 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\n> -static py::object valueOrTuple(const ControlValue &cv)\n> +static py::object valueOrTuple(const ControlValueView &cv)\n> {\n> if (cv.isArray()) {\n> const T *v = reinterpret_cast(cv.data().data());\n> @@ -31,7 +31,7 @@ static py::object valueOrTuple(const ControlValue &cv)\n> return py::cast(cv.get());\n> }\n> \n> -py::object controlValueToPy(const ControlValue &cv)\n> +py::object controlValueToPy(const ControlValueView &cv)\n> {\n> switch (cv.type()) {\n> case ControlTypeNone:\n> diff --git a/src/py/libcamera/py_helpers.h b/src/py/libcamera/py_helpers.h\n> index 983969dff..895006d0c 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 \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);\n> diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\n> index 441a70ab4..eb47f9dd3 100644\n> --- a/src/py/libcamera/py_main.cpp\n> +++ b/src/py/libcamera/py_main.cpp\n> @@ -460,7 +460,7 @@ PYBIND11_MODULE(_libcamera, m)\n> self.controls().set(id.id(), pyToControlValue(value, id.type()));\n> })\n> .def_property_readonly(\"metadata\", [](Request &self) {\n> - /* Convert ControlList to std container */\n> + /* Convert MetadataList to std container */\n> \n> std::unordered_map ret;\n> \n> -- \n> 2.50.1\n>","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 BAFDBC328C\n\tfor ;\n\tThu, 18 Sep 2025 13:11:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 898A969371;\n\tThu, 18 Sep 2025 15:11: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 1A8AC62C3B\n\tfor ;\n\tThu, 18 Sep 2025 15:11:55 +0200 (CEST)","from neptunite.rasen.tech (unknown\n\t[IPv6:2404:7a81:160:2100:7cf2:5f58:dd2a:9ec1])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id EACA19FC;\n\tThu, 18 Sep 2025 15:10:34 +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=\"BOdYjlhK\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1758201035;\n\tbh=p5UsOab8fnbtApb0HTk8CgW1UlAtY42IkhbyHCXmfbU=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=BOdYjlhK9pys74hmqT9A7OG8McMaA6w2UWsAMxzIjKTswzy+WrFsTLW5j1GSSt4qy\n\tMFbMdxIHKRgl5dGOmxmrKgH1XPYiH8eRjUijBLbMoqBv4P5E02HYP601Upfp1vFKxJ\n\tXlCWRbM8tBaVeWqDEh6tHIZS729sKeeyjk1thk88=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20250721104622.1550908-23-barnabas.pocze@ideasonboard.com>","References":"<20250721104622.1550908-1-barnabas.pocze@ideasonboard.com>\n\t<20250721104622.1550908-23-barnabas.pocze@ideasonboard.com>","Subject":"Re: [RFC PATCH v2 22/22] libcamera: request: Swap the two metadata\n\tlists","From":"Paul Elder ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 18 Sep 2025 22:11:49 +0900","Message-ID":"<175820110914.2127323.7427012667303858373@neptunite.rasen.tech>","User-Agent":"alot/0.0.0","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\" "}}]