From patchwork Thu Nov 19 16:39:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 29046 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 6A81BBDE17 for ; Thu, 19 Nov 2026 16:40:07 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 093756A931; Thu, 19 Nov 2026 17:40:03 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="WsfAFuYF"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 25AA26A92A for ; Thu, 19 Nov 2026 17:39:55 +0100 (CET) Received: from [192.168.1.7] (unknown [93.65.100.155]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id ECFAB1F10; 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=1795106246; bh=rhub5p8Xchm7d7XbW+A0OKJFJuH203E8BzGGiYgH4eM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WsfAFuYFyQ3M/0lkAinHeEH0QkjtuGZCIyIQ4MHA/JQAg1vJIaKANAHikAWy6s8fp +qOvFSaAnFuPFpM5IPMUs7AXmyNYyeeEpqoTX8zPDFfYPcM5wqNJKrn6EsUQQBjEq1 kcEbliVkGRaYZ0npYY5Y2/k2Kpi4/1kMHeb/erzE= From: Jacopo Mondi Date: Thu, 19 Nov 2026 17:39:48 +0100 Subject: [PATCH 6/6] libcamera: media_device: Delay topology creation at acquire() MIME-Version: 1.0 Message-Id: <20261119-multicontext-prep-v1-6-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=7603; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=rhub5p8Xchm7d7XbW+A0OKJFJuH203E8BzGGiYgH4eM=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBq/yZYLqIX5XyQl4l4kmFBDgtkizZmvz1j+gmhI 26bGlmScx6JAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCav8mWAAKCRByNAaPFqFW PHNnD/kBRkQvGRXrmdAg1XNYUF8PxpivIXvE3Q0wLGgdpmedYXPU85ylh+DMWDNmV3XbAdy5gGy D8xmuOqA0qi+nrWGD5OSQuAND1AhVkxUpkfwuCZYwhEmZGTP5Ex+7hyhCNfyzWBmhq4UMuxOgTR udhykqRivpSe8iCzJ0vlXMfeSod4lR81gPVNEofwveYHG+skUEYwqok0WaCeEWolzNLmjItmx7i FOyyn7g2htGC9O5n4iJdMHsvFFlG2eiTftBI9t51oxDSQVVyrKZLybNOGyJ6M20/jNNDjb6OJnW a9dqHjMW2ky/2jEcfCECj1zlf/0y7WPD9pA5WGJ4c85db8HIid2g8IPk02Sk6WNbAhDTeKVfLdw BU2vtauLCbBIdjFSuBUCYu1+tM4MGEGqRcRMst8XGYWufOTw45yaxj3Y3twVl/+CkDR9KCte8At jXKEFhFS3tw4C/xugsvDnEE/NQjZ7CIhiHZsCu3/4KRHxDzIIvSt/8wPNj5Py5F4L6a7exmJSmn Zujry6tWqKd3gwvxslvc0CtYnl7JBlaNUXeP1FSLnGV8oTpCkwd+89Td8sO5K5izwm78g+UVeJF cbRXlfLbRAcR8OxhPwlHGUOxcAf1ZUvCkBqWfyxS84MN68QSxl/EcyGWWNyJO7J7JehS41HT+B9 2JW/Wd3yrLWvsvw== 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" Now that we have removed all external dependencies on the MediaObject class hierarchy, we can delay its creation at MediaDevice::acquire() time. The only remaining user is MediaDevice::match() which runs before acquire(). As this is an internal user, modify it to use the raw kernel types to perform matching so that it can be run before MediaObjects are created from the raw topology. Add an enumerated_ flag to avoid double enumeration on acquire/release/acquire cycles, which is effectivelly a use case only for test units. The additional flag is not an ideal solution but will only stay until the introduction of the MediaContext class. Now that MediaObjects are only available after acquire(), update all tests that create V4L2Devices by entity name to aquire the media device first. Signed-off-by: Jacopo Mondi --- include/libcamera/internal/media_device.h | 1 + src/libcamera/device_enumerator.cpp | 2 -- src/libcamera/media_device.cpp | 20 ++++++++++++++------ test/camera-sensor.cpp | 8 ++++++++ test/delayed_controls.cpp | 12 ++++++++++++ test/libtest/buffer_source.cpp | 6 ++++++ test/v4l2_subdevice/v4l2_subdevice_test.cpp | 7 +++++++ test/v4l2_videodevice/v4l2_m2mdevice.cpp | 8 ++++++++ 8 files changed, 56 insertions(+), 8 deletions(-) diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h index 0e064e3fbcde..72b387926ee9 100644 --- a/include/libcamera/internal/media_device.h +++ b/include/libcamera/internal/media_device.h @@ -169,6 +169,7 @@ private: UniqueFD fd_; bool valid_; bool acquired_; + bool enumerated_; std::optional supportsRequests_; std::map objects_; diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp index ded3b41b5f26..2b1056425f61 100644 --- a/src/libcamera/device_enumerator.cpp +++ b/src/libcamera/device_enumerator.cpp @@ -248,8 +248,6 @@ void DeviceEnumerator::addDevice(std::unique_ptr media) LOG(DeviceEnumerator, Debug) << "Added device " << media->deviceNode() << ": " << media->driver(); - media->createTopology(); - devices_.push_back(std::move(media)); /* \todo To batch multiple additions, emit with a small delay here. */ diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index 0d5c3a18b471..ad38d7c4078e 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -66,7 +66,7 @@ LOG_DEFINE_CATEGORY(MediaDevice) * populate() before the media graph can be queried. */ MediaDevice::MediaDevice(const std::string &deviceNode) - : deviceNode_(deviceNode), valid_(false), acquired_(false) + : deviceNode_(deviceNode), valid_(false), acquired_(false), enumerated_(false) { } @@ -111,7 +111,13 @@ bool MediaDevice::acquire() if (open()) return false; + if (!enumerated_ && !createTopology()) { + close(); + return false; + } + acquired_ = true; + enumerated_ = true; return true; } @@ -322,13 +328,14 @@ bool MediaDevice::match(const DeviceMatch &device) const const auto &searchFn, bool breakEarly) { bool found = false; - for (const MediaEntity *entity : entities()) { - if (!searchFn(searchPattern, entity->name())) + for (const auto &ent : mediaV2Topology_.entities()) { + if (!searchFn(searchPattern, ent.name)) continue; - if (entity->deviceNode().empty()) { + const auto &it = devnodesMap_.find(ent.id); + if (it == devnodesMap_.end()) { LOG(MediaDevice, Debug) - << "Skip " << entity->name() + << "Skip " << ent.name << ": no device node"; continue; } @@ -336,7 +343,7 @@ bool MediaDevice::match(const DeviceMatch &device) const if (found) { LOG(MediaDevice, Error) << "Multiple entities match " - << entity->name(); + << ent.name; return false; } @@ -710,6 +717,7 @@ void MediaDevice::clear() objects_.clear(); entities_.clear(); valid_ = false; + enumerated_ = false; } /** diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp index c30a2212e362..04f01d2a14c7 100644 --- a/test/camera-sensor.cpp +++ b/test/camera-sensor.cpp @@ -46,6 +46,12 @@ protected: return TestSkip; } + if (!media_->acquire()) { + cerr << "Unable to acquire media device " + << media_->driver() << endl; + return TestFail; + } + MediaEntity *entity = media_->getEntityByName("Sensor A"); if (!entity) { cerr << "Unable to find media entity 'Sensor A'" << endl; @@ -121,6 +127,8 @@ protected: void cleanup() { + if (media_) + media_->release(); } private: diff --git a/test/delayed_controls.cpp b/test/delayed_controls.cpp index 7bd30e7aead8..36bb522e43b3 100644 --- a/test/delayed_controls.cpp +++ b/test/delayed_controls.cpp @@ -47,6 +47,12 @@ protected: return TestSkip; } + if (!media_->acquire()) { + cerr << "Unable to acquire media device " + << media_->driver() << endl; + return TestFail; + } + dev_ = V4L2VideoDevice::fromEntityName(media_.get(), "vivid-000-vid-cap"); if (dev_->open()) { cerr << "Failed to open video device" << endl; @@ -70,6 +76,12 @@ protected: return TestPass; } + void cleanup() override + { + if (media_) + media_->release(); + } + int singleControlNoDelay() { std::unordered_map delays = { diff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp index 97c8ae1cbd31..756931918871 100644 --- a/test/libtest/buffer_source.cpp +++ b/test/libtest/buffer_source.cpp @@ -52,6 +52,12 @@ int BufferSource::allocate(const StreamConfiguration &config) return TestSkip; } + if (!media_->acquire()) { + std::cerr << "Unable to acquire media device " + << media_->driver() << std::endl; + return TestFail; + } + std::unique_ptr video = V4L2VideoDevice::fromEntityName(media_.get(), videoDeviceName); if (!video) { diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.cpp b/test/v4l2_subdevice/v4l2_subdevice_test.cpp index c349c9e31c40..59f44a3bc124 100644 --- a/test/v4l2_subdevice/v4l2_subdevice_test.cpp +++ b/test/v4l2_subdevice/v4l2_subdevice_test.cpp @@ -46,6 +46,11 @@ int V4L2SubdeviceTest::init() return TestSkip; } + if (!media_->acquire()) { + cerr << "Unable to acquire media device " << media_->driver() << endl; + return TestFail; + } + MediaEntity *videoEntity = media_->getEntityByName("Scaler"); if (!videoEntity) { cerr << "Unable to find media entity 'Scaler'" << endl; @@ -64,5 +69,7 @@ int V4L2SubdeviceTest::init() void V4L2SubdeviceTest::cleanup() { + if (media_) + media_->release(); delete scaler_; } diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index c45f581a8653..90dc87366746 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -75,6 +75,12 @@ protected: return TestSkip; } + if (!media_->acquire()) { + cerr << "Unable to acquire media device " + << media_->driver() << endl; + return TestFail; + } + return TestPass; } @@ -193,6 +199,8 @@ protected: void cleanup() { + if (media_) + media_->release(); delete vim2m_; }