From patchwork Thu May 21 13:54:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 3834 Return-Path: Received: from o1.f.az.sendgrid.net (o1.f.az.sendgrid.net [208.117.55.132]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0BC5E60E3A for ; Thu, 21 May 2020 15:54:26 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=uajain.com header.i=@uajain.com header.b="RHmLBNsm"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uajain.com; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type; s=s1; bh=947S7DVuvlTm+8i8IFP//rdO5Jthn/wz8+oYu/zUtq0=; b=RHmLBNsmekG7tTDKP40BgpvXkLDACRuTqsBoQ5t1PgFehYwbeQPTz2i91N/k5LRoMEWG uZMKU0TbisVHFZbsSWtV7PFAIRYjLEu/FoRgHyUrVhTdWmXvtoBs8WWkSwbOTdsyHq9OKJ pDvj53Y8Kal0Ud2CbcZIx6SQXffyEfQZg= Received: by filterdrecv-p3iad2-8ddf98858-xxtk7 with SMTP id filterdrecv-p3iad2-8ddf98858-xxtk7-19-5EC68811-F 2020-05-21 13:54:25.454086813 +0000 UTC m=+4884415.326188984 Received: from mail.uajain.com (unknown) by ismtpd0002p1maa1.sendgrid.net (SG) with ESMTP id APaP3d8zSB6JcgguhOnXrA for ; Thu, 21 May 2020 13:54:24.468 +0000 (UTC) From: Umang Jain Date: Thu, 21 May 2020 13:54:25 +0000 (UTC) Message-Id: <20200521135416.13685-3-email@uajain.com> In-Reply-To: <20200521135416.13685-1-email@uajain.com> References: <20200521135416.13685-1-email@uajain.com> Mime-Version: 1.0 X-SG-EID: 1Q40EQ7YGir8a9gjSIAdTjhngY657NMk9ckeo4dbHZDiOpywc/L3L9rFqlwE4KPcREc2X1LpIgLW8oEasGbeg2Bl5j4DWfGLn/larXYgYhgN9fr5OnjLUzMofQ4XGnoUUbc9ciKFxnN1DhxKKazKGtf/TmgJnZzfgVlMD1QhZE3850RZLqVqnxHn5SF1+1v6wCGacd8oB+r12bRC+Tnrw3xe3L6Yw7O3mmLaKPBaDZkI9bcrA18JwMyWjACttepfoHkBFS2Me2QVY0yyzky03Q== To: libcamera-devel@lists.libcamera.org Subject: [libcamera-devel] [PATCH v3 2/5] libcamera: device_enumerator: Emit a signal when a new devices are added 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: , X-List-Received-Date: Thu, 21 May 2020 13:54:27 -0000 Emit a signal whenever a new MediaDevice(s) are added to the DeviceEnumerator. This will allow CameraManager to be notified about the new devices and it can re-emumerate all the devices currently present on the system. Device enumeration by the CameraManger is a expensive operation hence, we want one signal emission per 'x' milliseconds to notify multiple devices additions as a single batch, by the DeviceEnumerator. Add a \todo to investigate the support for that. Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart --- include/libcamera/internal/device_enumerator.h | 4 ++++ src/libcamera/camera_manager.cpp | 4 ++-- src/libcamera/device_enumerator.cpp | 13 +++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/libcamera/internal/device_enumerator.h b/include/libcamera/internal/device_enumerator.h index 433e357..aa6a6fe 100644 --- a/include/libcamera/internal/device_enumerator.h +++ b/include/libcamera/internal/device_enumerator.h @@ -13,6 +13,8 @@ #include +#include + namespace libcamera { class MediaDevice; @@ -43,6 +45,8 @@ public: std::shared_ptr search(const DeviceMatch &dm); + Signal<> deviceAdded; + protected: std::unique_ptr createDevice(const std::string &deviceNode); void addDevice(std::unique_ptr &&media); diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 8d9cb02..27064d2 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -153,12 +153,12 @@ void CameraManager::Private::enumerateDevices() } } - /* \todo register hot-plug callback here */ + enumerator_->deviceAdded.connect(this, &Private::enumerateDevices); } void CameraManager::Private::cleanup() { - /* \todo unregister hot-plug callback here */ + enumerator_->deviceAdded.disconnect(this, &Private::enumerateDevices); /* * Release all references to cameras and pipeline handlers to ensure diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp index e21a2a7..6c5ebb7 100644 --- a/src/libcamera/device_enumerator.cpp +++ b/src/libcamera/device_enumerator.cpp @@ -227,6 +227,16 @@ std::unique_ptr DeviceEnumerator::createDevice(const std::string &d return media; } +/** +* \var DeviceEnumerator::deviceAdded +* \brief Notify of new media devices being found +* +* This signal is emitted when the device enumerator finds new media devices in +* the system. It may be emitted for every newly detected device, or once for +* multiple of devices, at the discretion of the device enumerator. Not all +* device enumerator types may support dynamic detection of new devices. +*/ + /** * \brief Add a media device to the enumerator * \param[in] media media device instance to add @@ -242,6 +252,9 @@ void DeviceEnumerator::addDevice(std::unique_ptr &&media) << "Added device " << media->deviceNode() << ": " << media->driver(); devices_.push_back(std::move(media)); + + /* \todo: To batch multiple additions, emit with a small delay here. */ + deviceAdded.emit(); } /**