{"id":24167,"url":"https://patchwork.libcamera.org/api/1.1/patches/24167/?format=json","web_url":"https://patchwork.libcamera.org/patch/24167/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250820132316.1033443-3-dan.scally@ideasonboard.com>","date":"2025-08-20T13:23:15","name":"[2/3] libcamera: device_enumerator_udev: Add initMediaDevice()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"dc03df8f060ec20d96c4044811d3f4960112cae2","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/1.1/people/156/?format=json","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24167/mbox/","series":[{"id":5396,"url":"https://patchwork.libcamera.org/api/1.1/series/5396/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5396","date":"2025-08-20T13:23:13","name":"Fix fast-booting device enumeration problems","version":1,"mbox":"https://patchwork.libcamera.org/series/5396/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24167/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24167/checks/","tags":{},"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 3371CC32BB\n\tfor ;\n\tWed, 20 Aug 2025 13:23:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 37A13692D9;\n\tWed, 20 Aug 2025 15:23:42 +0200 (CEST)","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 3C1DF6924B\n\tfor ;\n\tWed, 20 Aug 2025 15:23:37 +0200 (CEST)","from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7DDD31737;\n\tWed, 20 Aug 2025 15:22:38 +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=\"EBk/ZxFY\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1755696158;\n\tbh=m2QHDUqBxfNJb0lR2NwG9UP5ZK+3RlPaAs2vQu5hcoE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EBk/ZxFYdjP2h5qQ91kUUpmrl6vasLNsV08rcSmweI7rptfiPQc6hcLWp1JGAMIdy\n\tq0gO3uhGAZjguLusJJ7w4YBb9I6BgpBnnB8VNmn+X+eV/h8saCF9R2vTndwLV9QIXc\n\tdjvcV+rgUKhzzFmJlmfDg3QMoVNCBZkvMqj2i/2E=","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Cc":"dan.scally@ideasonboard.com","Subject":"[PATCH 2/3] libcamera: device_enumerator_udev: Add initMediaDevice()","Date":"Wed, 20 Aug 2025 14:23:15 +0100","Message-ID":"<20250820132316.1033443-3-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20250820132316.1033443-1-dan.scally@ideasonboard.com>","References":"<20250820132316.1033443-1-dan.scally@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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\" "},"content":"We will shortly be processing MediaDevices created by the device\nenumerator in two places if they're initially deferreed. Move the\nsteps to a dedicated function so it can be called from multiple\nplaces.\n\nSigned-off-by: Daniel Scally \n---\n .../internal/device_enumerator_udev.h | 1 +\n src/libcamera/device_enumerator_udev.cpp | 58 ++++++++++---------\n 2 files changed, 33 insertions(+), 26 deletions(-)","diff":"diff --git a/include/libcamera/internal/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h\nindex 1378c1906..a5e5e6efe 100644\n--- a/include/libcamera/internal/device_enumerator_udev.h\n+++ b/include/libcamera/internal/device_enumerator_udev.h\n@@ -56,6 +56,7 @@ private:\n \n \tint addUdevDevice(struct udev_device *dev);\n \tint populateMediaDevice(MediaDevice *media, DependencyMap *deps);\n+\tint initMediaDevice(std::unique_ptr media);\n \tstd::string lookupDeviceNode(dev_t devnum);\n \n \tint addV4L2Device(dev_t devnum);\ndiff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp\nindex 4e20a3cc0..53b4fac80 100644\n--- a/src/libcamera/device_enumerator_udev.cpp\n+++ b/src/libcamera/device_enumerator_udev.cpp\n@@ -82,32 +82,7 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev)\n \t\tif (!media)\n \t\t\treturn -ENODEV;\n \n-\t\tDependencyMap deps;\n-\t\tint ret = populateMediaDevice(media.get(), &deps);\n-\t\tif (ret < 0) {\n-\t\t\tLOG(DeviceEnumerator, Warning)\n-\t\t\t\t<< \"Failed to populate media device \"\n-\t\t\t\t<< media->deviceNode()\n-\t\t\t\t<< \" (\" << media->driver() << \"), skipping\";\n-\t\t\treturn ret;\n-\t\t}\n-\n-\t\tif (!deps.empty()) {\n-\t\t\tLOG(DeviceEnumerator, Debug)\n-\t\t\t\t<< \"Defer media device \" << media->deviceNode()\n-\t\t\t\t<< \" due to \" << deps.size()\n-\t\t\t\t<< \" missing dependencies\";\n-\n-\t\t\tpending_.emplace_back(std::move(media), std::move(deps));\n-\t\t\tMediaDeviceDeps *mediaDeps = &pending_.back();\n-\t\t\tfor (const auto &dep : mediaDeps->deps_)\n-\t\t\t\tdevMap_[dep.first] = mediaDeps;\n-\n-\t\t\treturn 0;\n-\t\t}\n-\n-\t\taddDevice(std::move(media));\n-\t\treturn 0;\n+\t\treturn initMediaDevice(std::move(media));\n \t}\n \n \tif (!strcmp(subsystem, \"video4linux\")) {\n@@ -194,6 +169,37 @@ done:\n \treturn 0;\n }\n \n+int DeviceEnumeratorUdev::initMediaDevice(std::unique_ptr media)\n+{\n+\tDependencyMap deps;\n+\n+\tint ret = populateMediaDevice(media.get(), &deps);\n+\tif (ret < 0) {\n+\t\tLOG(DeviceEnumerator, Warning)\n+\t\t\t<< \"Failed to populate media device \"\n+\t\t\t<< media->deviceNode()\n+\t\t\t<< \" (\" << media->driver() << \"), skipping\";\n+\t\treturn ret;\n+\t}\n+\n+\tif (!deps.empty()) {\n+\t\tLOG(DeviceEnumerator, Debug)\n+\t\t\t<< \"Defer media device \" << media->deviceNode()\n+\t\t\t<< \" due to \" << deps.size()\n+\t\t\t<< \" missing dependencies\";\n+\n+\t\tpending_.emplace_back(std::move(media), std::move(deps));\n+\t\tMediaDeviceDeps *mediaDeps = &pending_.back();\n+\t\tfor (const auto &dep : mediaDeps->deps_)\n+\t\t\tdevMap_[dep.first] = mediaDeps;\n+\n+\t\treturn 0;\n+\t}\n+\n+\taddDevice(std::move(media));\n+\treturn 0;\n+}\n+\n int DeviceEnumeratorUdev::populateMediaDevice(MediaDevice *media, DependencyMap *deps)\n {\n \tstd::set children;\n","prefixes":["2/3"]}