From patchwork Thu Nov 19 16:39:45 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 29043 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 32159BDE17 for ; Thu, 19 Nov 2026 16:40:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 81FCF6A93F; Thu, 19 Nov 2026 17:39:59 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Vkwjhyjj"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 47B6D6A924 for ; Thu, 19 Nov 2026 17:39:54 +0100 (CET) Received: from [192.168.1.7] (unknown [93.65.100.155]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 19F0F13D3; Thu, 19 Nov 2026 17:37:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1795106245; bh=jjwzQV4uahwqqKFit26MBl2N/6xPJ8FV+mRs56l41Yg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Vkwjhyjjav5XSYoGVQMperL4UOZw0K6RpnqzjGH8/LzB1BwH9fveZGuV4+02+DXaG mVsPw5cTtPXAYdu9z0X3Te3P3a0WlXo1Gwh8sn94SMdW3GdkU2eqvbB55ANJpKWuPJ 3HhzzpHxJv3msgVVhjKVpPwU5jYGoKee6LZBqP+M= From: Jacopo Mondi Date: Thu, 19 Nov 2026 17:39:45 +0100 Subject: [PATCH 3/6] libcamera: media_device: Store the media v2 topology MIME-Version: 1.0 Message-Id: <20261119-multicontext-prep-v1-3-f68ea7ef960f@ideasonboard.com> References: <20261119-multicontext-prep-v1-0-f68ea7ef960f@ideasonboard.com> In-Reply-To: <20261119-multicontext-prep-v1-0-f68ea7ef960f@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5065; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=jjwzQV4uahwqqKFit26MBl2N/6xPJ8FV+mRs56l41Yg=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBq/yZY583/qi9dhswZ+pU0R42eoj7rFZ2uThtlx khNAH+JIjeJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCav8mWAAKCRByNAaPFqFW PO7OD/9tL/mutwE8wB9WSW3vkFe5hZAHMFFYEWBjyJEfA3/CFsn9mvtijnCAT1sK6d6+i7Ftw3z yXxspQX/GflAWDC+4CWHmSubl4nXB59eVUyOuZW7d90sO44++e6GFDerPU/pcX/QewEb/cyaySd GGwmjU+cBOMxFoXEu4dsopB0H4ExNk+LfNiLryUC6S2q5EYEGg2ZPtb82ToBlAtYmqD5c0SmxPS QS9dMv5iwY5pXLsaMfRzm5eAQVik36u1qGK243k8b/ZW0izBl0P6JTNGdkZpcRkOzLK/Qk1ZgYV zdFwlmfScuSIdU0NlvNySGagEb83PkKQ1TiOKZsDPyh2DQAnXRnJRwpFIIzLV1fN/CaF9k/Gj94 g1Vqxovp4QRJRTtVgaGDHUGh9dxWGdyy8ysu3cXDms8dblfjeFirZZAoyxqazNYqFglnnelU4Vv LvhXiE0qdU69T2xAhT6N0BMMZsvMg9kABHiBYQECuxqDo+DyROU69iirwtkgkEXcigJoQZ/wEvX jYNkQPwliav2pYBK05ZWm+ER0DGi7bEJ5i5VZeCJjG1K3lI6b6fx2s7jHMg4KImXICOxOlGkYFh /6evD1RFhFkknIKmSr8Nx4eSAIftp+ARln/6zInxGsUp4sHgIVzJqniGNe92HabL6kVPTaQdUBV m++bwAAnv1To0jQ== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B 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" Create an helper class in MediaDevice that wraps the kernel type struct media_v2_topology and its backing memory instead of manually allocating it in MediaDevice::populate(). Make an instance of the new MediaV2Topology a class member. This means the kernel types and their backing memory remain valid after MediaDevice::populate() returns. This will be useful to delay the creation of MediaObject to a later point in time, and have the MediaDevice class users that need to only enumerate entities to operate using the raw kernel structures. In the long run, this will allow us to split the MediaDevice class into a static version and one populated version where MediaObjects are accessible from. Signed-off-by: Jacopo Mondi --- include/libcamera/internal/media_device.h | 40 ++++++++++++++++++++++++++++++ src/libcamera/media_device.cpp | 41 +++++++------------------------ 2 files changed, 49 insertions(+), 32 deletions(-) diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h index c1405142f726..8bab60343aad 100644 --- a/include/libcamera/internal/media_device.h +++ b/include/libcamera/internal/media_device.h @@ -97,6 +97,46 @@ private: unsigned int version_; unsigned int hwRevision_; + class MediaV2Topology + { + public: + uint64_t version() const { return topology_.topology_version; } + + void allocate() + { + if (!topology_.num_entities) + return; + + clear(); + + ents_ = new struct media_v2_entity[topology_.num_entities](); + interfaces_ = new struct media_v2_interface[topology_.num_interfaces](); + links_ = new struct media_v2_link[topology_.num_links](); + pads_ = new struct media_v2_pad[topology_.num_pads](); + + topology_.ptr_entities = reinterpret_cast(ents_); + topology_.ptr_interfaces = reinterpret_cast(interfaces_); + topology_.ptr_links = reinterpret_cast(links_); + topology_.ptr_pads = reinterpret_cast(pads_); + } + + void clear() + { + delete[] ents_; + delete[] interfaces_; + delete[] pads_; + delete[] links_; + } + + struct media_v2_topology topology_ = {}; + + private: + struct media_v2_entity *ents_ = nullptr; + struct media_v2_interface *interfaces_ = nullptr; + struct media_v2_link *links_ = nullptr; + struct media_v2_pad *pads_ = nullptr; + } mediaV2Topology_; + UniqueFD fd_; bool valid_; bool acquired_; diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index a84bc9abc4e9..f9562aa18b80 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -195,11 +195,6 @@ void MediaDevice::unlock() */ int MediaDevice::populate() { - struct media_v2_topology topology = {}; - struct media_v2_entity *ents = nullptr; - struct media_v2_interface *interfaces = nullptr; - struct media_v2_link *links = nullptr; - struct media_v2_pad *pads = nullptr; __u64 version = -1; int ret; @@ -227,13 +222,7 @@ int MediaDevice::populate() * Keep calling G_TOPOLOGY until the version number stays stable. */ while (true) { - topology.topology_version = 0; - topology.ptr_entities = reinterpret_cast(ents); - topology.ptr_interfaces = reinterpret_cast(interfaces); - topology.ptr_links = reinterpret_cast(links); - topology.ptr_pads = reinterpret_cast(pads); - - ret = ioctl(fd_.get(), MEDIA_IOC_G_TOPOLOGY, &topology); + ret = ioctl(fd_.get(), MEDIA_IOC_G_TOPOLOGY, &mediaV2Topology_.topology_); if (ret < 0) { ret = -errno; LOG(MediaDevice, Error) @@ -242,37 +231,23 @@ int MediaDevice::populate() goto done; } - if (version == topology.topology_version) + if (version == mediaV2Topology_.version()) break; - delete[] ents; - delete[] interfaces; - delete[] pads; - delete[] links; - - ents = new struct media_v2_entity[topology.num_entities](); - interfaces = new struct media_v2_interface[topology.num_interfaces](); - links = new struct media_v2_link[topology.num_links](); - pads = new struct media_v2_pad[topology.num_pads](); - - version = topology.topology_version; + mediaV2Topology_.allocate(); + version = mediaV2Topology_.version(); } /* Populate entities, pads and links. */ - if (populateEntities(topology) && - populatePads(topology) && - populateLinks(topology)) + if (populateEntities(mediaV2Topology_.topology_) && + populatePads(mediaV2Topology_.topology_) && + populateLinks(mediaV2Topology_.topology_)) valid_ = true; ret = 0; done: close(); - delete[] ents; - delete[] interfaces; - delete[] pads; - delete[] links; - if (!valid_) { clear(); return -EINVAL; @@ -657,6 +632,8 @@ bool MediaDevice::addObject(MediaObject *object) */ void MediaDevice::clear() { + mediaV2Topology_.clear(); + for (const auto &o : objects_) delete o.second;