{"id":18740,"url":"https://patchwork.libcamera.org/api/1.1/patches/18740/?format=json","web_url":"https://patchwork.libcamera.org/patch/18740/","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":"<20230615172608.378258-4-kieran.bingham@ideasonboard.com>","date":"2023-06-15T17:26:06","name":"[libcamera-devel,v4,3/5] libcamera: camera_manager: Move {add, remove}Camera to internal","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1b78295d408f3301deca5f7a14cdab577ee13c06","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18740/mbox/","series":[{"id":3925,"url":"https://patchwork.libcamera.org/api/1.1/series/3925/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3925","date":"2023-06-15T17:26:03","name":"libcamera: Add new Camera devices property","version":4,"mbox":"https://patchwork.libcamera.org/series/3925/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18740/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18740/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 5C149C3291\n\tfor ;\n\tThu, 15 Jun 2023 17:26:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3E986628C8;\n\tThu, 15 Jun 2023 19:26:20 +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 B40AF628BB\n\tfor ;\n\tThu, 15 Jun 2023 19:26:16 +0200 (CEST)","from Monstersaurus.local\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0C902DFB;\n\tThu, 15 Jun 2023 19:25:45 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1686849980;\n\tbh=3uM+FQeNtAq1HBah6XYx6pdCz2blzMPIpWIOXkCd/xA=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=XYY9sgNnsCwY0W8dTNGSP1dpC57VVHXzF1bmSBRXQg8ARTJ0U8kw1i9gtAvKzlHGW\n\tfBVLwgdMW17iQ90xBQvB8woRIS2FAmfh6gqD25B7v7qR9Zj9G09r4qo1EBpaixkobm\n\tmSRbe92TCjDzA6d8LOIM9SNYlT5hBHflBxxPsNDbZi3ZXDtQ42/0+ctSeGmoP1BM0k\n\tNe/boADgfGStWtsdkWPIkF86Mighs9GIHXPs2FVOuS7B+Z6X1OrJ0XJTHqgPYEqUlj\n\t59OEi8B2u8WA5ifUOTDdj7DDSi56xbPqAJSbJeR+G1vOFR6YXYppkcBL7IbofW+RuD\n\tdw1FJvb+XqqZw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1686849945;\n\tbh=3uM+FQeNtAq1HBah6XYx6pdCz2blzMPIpWIOXkCd/xA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=nxbTnZHvksaynXnjA6fJhZ+p8gV9n6Q4dTEPT645OKONdCbyGST7rlyYi6WMIhy6R\n\tEMsWgwvzYgDhxBTicraLfKOO99CmpEYY4DgJPye8P4AbaRnIHwsH/ciQa9IXMFOglx\n\tVvNj5HDCxb/AZmucdOluM6ipv0Dq+Mr+lj13eGNk="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"nxbTnZHv\"; dkim-atps=neutral","To":"libcamera devel ","Date":"Thu, 15 Jun 2023 18:26:06 +0100","Message-Id":"<20230615172608.378258-4-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20230615172608.378258-1-kieran.bingham@ideasonboard.com>","References":"<20230615172608.378258-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 3/5] libcamera: camera_manager: Move\n\t{add, remove}Camera to internal","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","From":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Cc":"Jacopo Mondi ,\n\tAshok Sidipotu ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The CameraManager exposes addCamera and removeCamera as public API\ncalls, while they should never be called from an application. These\ncalls are only expected to be used by PipelineHandlers to update the\nCameraManager that a new Camera has been created and allow the Camera\nManager to expose it to applications.\n\nRemove the public calls and update the private implementations such that\nthey can be used directly by the PipelineHandler through the internal\nCameraManager::Private provided by the Extensible class.\n\nReviewed-by: Jacopo Mondi \nTested-by: Ashok Sidipotu \nReviewed-by: Laurent Pinchart \nSigned-off-by: Kieran Bingham \n---\n include/libcamera/camera_manager.h | 4 -\n include/libcamera/internal/camera_manager.h | 2 +-\n src/libcamera/camera_manager.cpp | 87 +++++++++------------\n src/libcamera/pipeline_handler.cpp | 6 +-\n 4 files changed, 43 insertions(+), 56 deletions(-)","diff":"diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 4b1fb7568e83..9767acc42c89 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -34,10 +34,6 @@ public:\n \tstd::shared_ptr get(const std::string &id);\n \tstd::shared_ptr get(dev_t devnum);\n \n-\tvoid addCamera(std::shared_ptr camera,\n-\t\t const std::vector &devnums);\n-\tvoid removeCamera(std::shared_ptr camera);\n-\n \tstatic const std::string &version() { return version_; }\n \n \tSignal> cameraAdded;\ndiff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h\nindex 96a83bd7ef3c..84aac499ea13 100644\n--- a/include/libcamera/internal/camera_manager.h\n+++ b/include/libcamera/internal/camera_manager.h\n@@ -37,7 +37,7 @@ public:\n \tint start();\n \tvoid addCamera(std::shared_ptr camera,\n \t\t const std::vector &devnums) LIBCAMERA_TSA_EXCLUDES(mutex_);\n-\tvoid removeCamera(Camera *camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n+\tvoid removeCamera(std::shared_ptr camera) LIBCAMERA_TSA_EXCLUDES(mutex_);\n \n \t/*\n \t * This mutex protects\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 882b2d4b234c..cafd7bce574e 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -148,9 +148,25 @@ void CameraManager::Private::cleanup()\n \tenumerator_.reset(nullptr);\n }\n \n+/**\n+ * \\brief Add a camera to the camera manager\n+ * \\param[in] camera The camera to be added\n+ * \\param[in] devnums The device numbers to associate with \\a camera\n+ *\n+ * This function is called by pipeline handlers to register the cameras they\n+ * handle with the camera manager. Registered cameras are immediately made\n+ * available to the system.\n+ *\n+ * \\a devnums are used by the V4L2 compatibility layer to map V4L2 device nodes\n+ * to Camera instances.\n+ *\n+ * \\context This function shall be called from the CameraManager thread.\n+ */\n void CameraManager::Private::addCamera(std::shared_ptr camera,\n \t\t\t\t const std::vector &devnums)\n {\n+\tASSERT(Thread::current() == this);\n+\n \tMutexLocker locker(mutex_);\n \n \tfor (const std::shared_ptr &c : cameras_) {\n@@ -167,15 +183,31 @@ void CameraManager::Private::addCamera(std::shared_ptr camera,\n \tunsigned int index = cameras_.size() - 1;\n \tfor (dev_t devnum : devnums)\n \t\tcamerasByDevnum_[devnum] = cameras_[index];\n+\n+\t/* Report the addition to the public signal */\n+\tCameraManager *const o = LIBCAMERA_O_PTR();\n+\to->cameraAdded.emit(cameras_[index]);\n }\n \n-void CameraManager::Private::removeCamera(Camera *camera)\n+/**\n+ * \\brief Remove a camera from the camera manager\n+ * \\param[in] camera The camera to be removed\n+ *\n+ * This function is called by pipeline handlers to unregister cameras from the\n+ * camera manager. Unregistered cameras won't be reported anymore by the\n+ * cameras() and get() calls, but references may still exist in applications.\n+ *\n+ * \\context This function shall be called from the CameraManager thread.\n+ */\n+void CameraManager::Private::removeCamera(std::shared_ptr camera)\n {\n+\tASSERT(Thread::current() == this);\n+\n \tMutexLocker locker(mutex_);\n \n \tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n \t\t\t\t [camera](std::shared_ptr &c) {\n-\t\t\t\t\t return c.get() == camera;\n+\t\t\t\t\t return c.get() == camera.get();\n \t\t\t\t });\n \tif (iter == cameras_.end())\n \t\treturn;\n@@ -185,12 +217,16 @@ void CameraManager::Private::removeCamera(Camera *camera)\n \n \tauto iter_d = std::find_if(camerasByDevnum_.begin(), camerasByDevnum_.end(),\n \t\t\t\t [camera](const std::pair> &p) {\n-\t\t\t\t\t return p.second.lock().get() == camera;\n+\t\t\t\t\t return p.second.lock().get() == camera.get();\n \t\t\t\t });\n \tif (iter_d != camerasByDevnum_.end())\n \t\tcamerasByDevnum_.erase(iter_d);\n \n \tcameras_.erase(iter);\n+\n+\t/* Report the removal to the public signal */\n+\tCameraManager *const o = LIBCAMERA_O_PTR();\n+\to->cameraRemoved.emit(camera);\n }\n \n /**\n@@ -383,51 +419,6 @@ std::shared_ptr CameraManager::get(dev_t devnum)\n * perform any blocking operation.\n */\n \n-/**\n- * \\brief Add a camera to the camera manager\n- * \\param[in] camera The camera to be added\n- * \\param[in] devnums The device numbers to associate with \\a camera\n- *\n- * This function is called by pipeline handlers to register the cameras they\n- * handle with the camera manager. Registered cameras are immediately made\n- * available to the system.\n- *\n- * \\a devnums are used by the V4L2 compatibility layer to map V4L2 device nodes\n- * to Camera instances.\n- *\n- * \\context This function shall be called from the CameraManager thread.\n- */\n-void CameraManager::addCamera(std::shared_ptr camera,\n-\t\t\t const std::vector &devnums)\n-{\n-\tPrivate *const d = _d();\n-\n-\tASSERT(Thread::current() == d);\n-\n-\td->addCamera(camera, devnums);\n-\tcameraAdded.emit(camera);\n-}\n-\n-/**\n- * \\brief Remove a camera from the camera manager\n- * \\param[in] camera The camera to be removed\n- *\n- * This function is called by pipeline handlers to unregister cameras from the\n- * camera manager. Unregistered cameras won't be reported anymore by the\n- * cameras() and get() calls, but references may still exist in applications.\n- *\n- * \\context This function shall be called from the CameraManager thread.\n- */\n-void CameraManager::removeCamera(std::shared_ptr camera)\n-{\n-\tPrivate *const d = _d();\n-\n-\tASSERT(Thread::current() == d);\n-\n-\td->removeCamera(camera.get());\n-\tcameraRemoved.emit(camera);\n-}\n-\n /**\n * \\fn const std::string &CameraManager::version()\n * \\brief Retrieve the libcamera version string\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex f72613b8e515..49092ea88a58 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -16,10 +16,10 @@\n #include \n \n #include \n-#include \n #include \n \n #include \"libcamera/internal/camera.h\"\n+#include \"libcamera/internal/camera_manager.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n #include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/media_device.h\"\n@@ -624,7 +624,7 @@ void PipelineHandler::registerCamera(std::shared_ptr camera)\n \t\t}\n \t}\n \n-\tmanager_->addCamera(std::move(camera), devnums);\n+\tmanager_->_d()->addCamera(std::move(camera), devnums);\n }\n \n /**\n@@ -691,7 +691,7 @@ void PipelineHandler::disconnect()\n \t\t\tcontinue;\n \n \t\tcamera->disconnect();\n-\t\tmanager_->removeCamera(camera);\n+\t\tmanager_->_d()->removeCamera(camera);\n \t}\n }\n \n","prefixes":["libcamera-devel","v4","3/5"]}