[{"id":36616,"web_url":"https://patchwork.libcamera.org/comment/36616/","msgid":"<176209812486.2973778.17189192469616589372@ping.linuxembedded.co.uk>","date":"2025-11-02T15:42:04","subject":"Re: [RFC PATCH v3 22/22] libcamera: request: Swap the two metadata\n\tlists","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Barnabás Pőcze (2025-10-30 16:58:16)\n> Swap `metadata_` and `metadata2_`, so `MetadataList` is used as the primary\n> metadata list of a request.\n> \n\nAh now I see what's happened earlier with the metadata2 ... but\npersonally I think we should just convert usages straight to the\nmetadata list - and not add a metadata2 ...\n\nIs there a specific benefit to keeping ControlList metadata2() that I'm\nnot seeing ?\n\n\n> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n> Reviewed-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(-)\n> \n> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\n> index 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>         void metadataAvailable(Request *request, const Control<T> &ctrl,\n>                                const internal::cxx20::type_identity_t<T> &value)\n>         {\n> -               auto &m = request->metadata2();\n> +               auto &m = request->metadata();\n>                 const auto c = m.checkpoint();\n>  \n>                 std::ignore = 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> @@ -88,8 +88,8 @@ public:\n>                 void operator()(const Control<T> &ctrl,\n>                                 const internal::cxx20::type_identity_t<T> &value) const\n>                 {\n> -                       request->metadata().set(ctrl, value);\n> -                       std::ignore = request->metadata2().set(ctrl, value);\n> +                       std::ignore = request->metadata().set(ctrl, value);\n> +                       request->metadata2().set(ctrl, value);\n>                 }\n>         };\n>  \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 23e7bde72c..6e7057c1d5 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 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> -       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 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>         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 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> -                          [[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 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>         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 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>                      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 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>         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 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> -                           [[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 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>         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 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> -       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 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> -       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>                 LOG(Pipeline, Fatal) << \"Tried to add incompatible metadata items\";\n>  \n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index 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>         : Extensible(std::make_unique<Private>(camera)),\n> -         metadata2_(camera->_d()->metadataPlan_),\n> +         metadata_(camera->_d()->metadataPlan_),\n>           cookie_(cookie), status_(RequestPending)\n>  {\n>         controls_ = new ControlList(controls::controls,\n> @@ -366,7 +366,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> @@ -377,7 +377,7 @@ Request::~Request()\n>  {\n>         LIBCAMERA_TRACEPOINT(request_destroy, this);\n>  \n> -       delete metadata_;\n> +       delete metadata2_;\n>         delete controls_;\n>  }\n>  \n> @@ -410,8 +410,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 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>         if (cv.isArray()) {\n>                 const T *v = reinterpret_cast<const T *>(cv.data().data());\n> @@ -31,7 +31,7 @@ static py::object valueOrTuple(const ControlValue &cv)\n>         return py::cast(cv.get<T>());\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 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);\n> diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\n> index 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>                         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<const ControlId *, py::object> ret;\n>  \n> -- \n> 2.51.1\n>","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 3B017BDE4C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun,  2 Nov 2025 15:42:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6D88960A9D;\n\tSun,  2 Nov 2025 16:42:09 +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 7345F606E6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun,  2 Nov 2025 16:42:08 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2E72F10D4;\n\tSun,  2 Nov 2025 16:40:16 +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=\"sTZwwVAV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1762098016;\n\tbh=CexXufEnFC3kDlBZuO4ZZjwb0CWo3pSBLChwic120eI=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=sTZwwVAV3azIiz7zKLxrAbqCzYDtgd1Wau7QjYZLJCwFuP+mphZTGaBJ8PK6qh4LU\n\tVN9gsIQgd5u9E2ymBSNm7rHiqPF35cwBhSLf32/VnEGhiv++unmyxkNKfEHS7G0raf\n\tuexpUZ5Cb/5Ueqmo9T2tfbiS4BoQ0RxvWo+0Zwpo=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251030165816.1095180-23-barnabas.pocze@ideasonboard.com>","References":"<20251030165816.1095180-1-barnabas.pocze@ideasonboard.com>\n\t<20251030165816.1095180-23-barnabas.pocze@ideasonboard.com>","Subject":"Re: [RFC PATCH v3 22/22] libcamera: request: Swap the two metadata\n\tlists","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"Jacopo Mondi <jacopo.mondi@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","Date":"Sun, 02 Nov 2025 15:42:04 +0000","Message-ID":"<176209812486.2973778.17189192469616589372@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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>"}},{"id":36635,"web_url":"https://patchwork.libcamera.org/comment/36635/","msgid":"<25e079bb-9be7-416e-9e6d-536cc43c917e@ideasonboard.com>","date":"2025-11-03T09:07:22","subject":"Re: [RFC PATCH v3 22/22] libcamera: request: Swap the two metadata\n\tlists","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"content":"Hi\n\n2025. 11. 02. 16:42 keltezéssel, Kieran Bingham írta:\n> Quoting Barnabás Pőcze (2025-10-30 16:58:16)\n>> Swap `metadata_` and `metadata2_`, so `MetadataList` is used as the primary\n>> metadata list of a request.\n>>\n> \n> Ah now I see what's happened earlier with the metadata2 ... but\n> personally I think we should just convert usages straight to the\n> metadata list - and not add a metadata2 ...\n> \n> Is there a specific benefit to keeping ControlList metadata2() that I'm\n> not seeing ?\n\nIt is (was) useful for testing. There is one commit intentionally\n\"missing\" that removes `metadata2()`.\n\n\n> \n> \n>> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n>> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n>> Reviewed-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(-)\n>>\n>> diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\n>> index 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>>          void metadataAvailable(Request *request, const Control<T> &ctrl,\n>>                                 const internal::cxx20::type_identity_t<T> &value)\n>>          {\n>> -               auto &m = request->metadata2();\n>> +               auto &m = request->metadata();\n>>                  const auto c = m.checkpoint();\n>>   \n>>                  std::ignore = 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>> @@ -88,8 +88,8 @@ public:\n>>                  void operator()(const Control<T> &ctrl,\n>>                                  const internal::cxx20::type_identity_t<T> &value) const\n>>                  {\n>> -                       request->metadata().set(ctrl, value);\n>> -                       std::ignore = request->metadata2().set(ctrl, value);\n>> +                       std::ignore = request->metadata().set(ctrl, value);\n>> +                       request->metadata2().set(ctrl, value);\n>>                  }\n>>          };\n>>   \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 23e7bde72c..6e7057c1d5 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 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>> -       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 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>>          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 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>> -                          [[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 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>>          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 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>>                       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 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>>          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 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>> -                           [[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 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>>          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 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>> -       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 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>> -       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>>                  LOG(Pipeline, Fatal) << \"Tried to add incompatible metadata items\";\n>>   \n>> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n>> index 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>>          : Extensible(std::make_unique<Private>(camera)),\n>> -         metadata2_(camera->_d()->metadataPlan_),\n>> +         metadata_(camera->_d()->metadataPlan_),\n>>            cookie_(cookie), status_(RequestPending)\n>>   {\n>>          controls_ = new ControlList(controls::controls,\n>> @@ -366,7 +366,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>> @@ -377,7 +377,7 @@ Request::~Request()\n>>   {\n>>          LIBCAMERA_TRACEPOINT(request_destroy, this);\n>>   \n>> -       delete metadata_;\n>> +       delete metadata2_;\n>>          delete controls_;\n>>   }\n>>   \n>> @@ -410,8 +410,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 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>>          if (cv.isArray()) {\n>>                  const T *v = reinterpret_cast<const T *>(cv.data().data());\n>> @@ -31,7 +31,7 @@ static py::object valueOrTuple(const ControlValue &cv)\n>>          return py::cast(cv.get<T>());\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 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);\n>> diff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\n>> index 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>>                          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<const ControlId *, py::object> ret;\n>>   \n>> -- \n>> 2.51.1\n>>","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 4242EC3241\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  3 Nov 2025 09:07:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 253CC609D8;\n\tMon,  3 Nov 2025 10:07:28 +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 E5EBB60805\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  3 Nov 2025 10:07:25 +0100 (CET)","from [192.168.33.39] (185.221.140.239.nat.pool.zt.hu\n\t[185.221.140.239])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E902A99F;\n\tMon,  3 Nov 2025 10:05:32 +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=\"HT38euI8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1762160733;\n\tbh=Ze4PtYYnj1ujzki/dGK2rddKFjOwZVdNG8dveukMHcY=;\n\th=Date:Subject:To:Cc:References:From:In-Reply-To:From;\n\tb=HT38euI8nUX0dW7ddDqYVKP/LLUcH4lg/2StYhZ7tihzu3OdKIaNvoueEk3yNRodi\n\tic/ylpLwPO383sPb9M+atalddoHLt2BzLmePUE8aA/PM0Ksbj2/5PK5K6RQ6Y5LPgZ\n\tljoz6+cMFsLl9MlX+mPBBDnVYjGI2aZ+yVLr8Qd8=","Message-ID":"<25e079bb-9be7-416e-9e6d-536cc43c917e@ideasonboard.com>","Date":"Mon, 3 Nov 2025 10:07:22 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [RFC PATCH v3 22/22] libcamera: request: Swap the two metadata\n\tlists","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","Cc":"Jacopo Mondi <jacopo.mondi@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>","References":"<20251030165816.1095180-1-barnabas.pocze@ideasonboard.com>\n\t<20251030165816.1095180-23-barnabas.pocze@ideasonboard.com>\n\t<176209812486.2973778.17189192469616589372@ping.linuxembedded.co.uk>","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>","Content-Language":"en-US, hu-HU","In-Reply-To":"<176209812486.2973778.17189192469616589372@ping.linuxembedded.co.uk>","Content-Type":"text/plain; charset=UTF-8; format=flowed","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>"}}]