From patchwork Tue Jan 6 16:57:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 25641 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 8EF59BDCBF for ; Tue, 6 Jan 2026 16:58:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6FC8361FEC; Tue, 6 Jan 2026 17:58:10 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="dTfR8L/j"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DB2E461FCC for ; Tue, 6 Jan 2026 17:58:00 +0100 (CET) Received: from pb-laptop.local (185.221.143.114.nat.pool.zt.hu [185.221.143.114]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CB5F51924; Tue, 6 Jan 2026 17:57:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1767718659; bh=uo7flEGhas2heoe8Xah3bBOF4KdVGGGD9l326H5HN2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dTfR8L/jSBfNvrm+fKmWpS/OrmufO/XdZVZhj75RFC4ZT4JYMh8MhGlERjNShV6N6 HHair4H+2tzoAm+B370lL+jL0d6+X5Ly7EXZGc4fMPTBjNmNxYHkDgamyXJRqf9lpJ EG47RXgRk1gYjPYHaNQvV0hhgRJth9NE8LTBIgmQ= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi , Paul Elder Subject: [PATCH v4 11/22] libcamera: request: Store `MetadataList` Date: Tue, 6 Jan 2026 17:57:43 +0100 Message-ID: <20260106165754.1759831-12-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260106165754.1759831-1-barnabas.pocze@ideasonboard.com> References: <20260106165754.1759831-1-barnabas.pocze@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a `MetadataList` to the `Request` object to store the metadata items returned by the camera. The metadata list is initialized using the camera's `MetadataListPlan` object, which is supposed to be filled by the pipeline handlers. This new list is exposed as `metadata2`, and the old `ControlList` is still present for now. Signed-off-by: Barnabás Pőcze Reviewed-by: Jacopo Mondi Reviewed-by: Paul Elder --- include/libcamera/internal/request.h | 5 +++++ include/libcamera/request.h | 5 +++++ src/libcamera/request.cpp | 11 ++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/libcamera/internal/request.h b/include/libcamera/internal/request.h index 693097ee9..3e10ae051 100644 --- a/include/libcamera/internal/request.h +++ b/include/libcamera/internal/request.h @@ -16,6 +16,7 @@ #include #include +#include #include using namespace std::chrono_literals; @@ -37,6 +38,9 @@ public: bool hasPendingBuffers() const; ControlList &metadata() { return metadata_; } +#ifndef __DOXYGEN__ + [[nodiscard]] MetadataList &metadata2() { return metadata2_; } +#endif bool completeBuffer(FrameBuffer *buffer); void complete(); @@ -64,6 +68,7 @@ private: std::map notifiers_; std::unique_ptr timer_; ControlList metadata_; + MetadataList metadata2_; }; } /* namespace libcamera */ diff --git a/include/libcamera/request.h b/include/libcamera/request.h index 290983f61..96755a655 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -24,6 +24,7 @@ namespace libcamera { class Camera; class CameraControlValidator; class FrameBuffer; +class MetadataList; class Stream; class Request : public Extensible @@ -51,6 +52,10 @@ public: ControlList &controls() { return controls_; } const ControlList &metadata() const; +#ifndef __DOXYGEN__ + [[nodiscard]] const MetadataList &metadata2() const; +#endif + const BufferMap &buffers() const { return bufferMap_; } int addBuffer(const Stream *stream, FrameBuffer *buffer, std::unique_ptr &&fence = {}); diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 57f1f060d..6d44c6749 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -57,7 +57,8 @@ LOG_DEFINE_CATEGORY(Request) * \todo Add a validator for metadata controls. */ Request::Private::Private(Camera *camera) - : camera_(camera), cancelled_(false), metadata_(controls::controls) + : camera_(camera), cancelled_(false), metadata_(controls::controls), + metadata2_(camera->metadata()) { } @@ -405,6 +406,7 @@ void Request::reuse(ReuseFlag flags) controls_.clear(); _d()->metadata_.clear(); + _d()->metadata2_.clear(); } /** @@ -432,6 +434,13 @@ const ControlList &Request::metadata() const return _d()->metadata_; } +#ifndef __DOXYGEN__ +const MetadataList &Request::metadata2() const +{ + return _d()->metadata2_; +} +#endif + /** * \fn Request::buffers() * \brief Retrieve the request's streams to buffers map