[{"id":11988,"web_url":"https://patchwork.libcamera.org/comment/11988/","msgid":"<3dc4e56c-6acc-ff5a-3cd2-2a34780b2b0f@ideasonboard.com>","date":"2020-08-13T14:35:16","subject":"Re: [libcamera-devel] [PATCH v2 4/4] android: camera_hal_manager:\n\tHandle hot-unplug of currently open camera","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Umang,\n\nOn 10/08/2020 13:04, Umang Jain wrote:\n> Maintain an extra ref for the currently open camera in CameraHalManager.\n> This will ensure we have an graceful handling if the currently open\n> camera is hot-unplugged.\n> \n> Signed-off-by: Umang Jain \n> ---\n> src/android/camera_device.h | 1 +\n> src/android/camera_hal_manager.cpp | 18 +++++++++++++++---\n> src/android/camera_hal_manager.h | 2 ++\n> 3 files changed, 18 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 7f9e010..2dc0a20 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -61,6 +61,7 @@ public:\n> \n> \tint facing() const { return facing_; }\n> \tint orientation() const { return orientation_; }\n> +\tbool running() { return running_; }\n> \n> \tvoid setCallbacks(const camera3_callback_ops_t *callbacks);\n> \tconst camera_metadata_t *getStaticMetadata();\n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index fdde2c0..9db5954 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -38,6 +38,8 @@ CameraHalManager::~CameraHalManager()\n> \tcameras_.clear();\n> \tcamerasMap_.clear();\n> \n> +\tcameraInUse_.reset();\n> +\n> \tif (cameraManager_) {\n> \t\tcameraManager_->stop();\n> \t\tdelete cameraManager_;\n> @@ -55,6 +57,7 @@ int CameraHalManager::init()\n> \n> \tcameraCounter_ = 0;\n> \texternalCameraCounter_ = 1000;\n> +\tcameraInUse_ = nullptr;\n\nShould this be initialised at constructor? or perhaps it already is and\nthis is a reinitialise?\n\n\n> \n> \tint ret = cameraManager_->start();\n> \tif (ret) {\n> @@ -82,14 +85,17 @@ CameraDevice *CameraHalManager::open(unsigned int id,\n> \t\treturn nullptr;\n> \t}\n> \n> -\tCameraDevice *camera = iter->get();\n> +\tif (cameraInUse_)\n> +\t\tcameraInUse_.reset();\n\nThis looks like it's a leak when opening a second device?\nAs in - now it has forgotten the first ...\n\n> +\n> +\tcameraInUse_ = std::move(*iter);\n> \n> -\tif (camera->open(hardwareModule))\n> +\tif (cameraInUse_->open(hardwareModule))\n> \t\treturn nullptr;\n> \n> \tLOG(HAL, Info) << \"Open camera '\" << id << \"'\";\n> \n> -\treturn camera;\n> +\treturn cameraInUse_.get();\n> }\n> \n> void CameraHalManager::cameraAdded(std::shared_ptr cam)\n> @@ -169,6 +175,12 @@ void CameraHalManager::cameraRemoved(std::shared_ptr cam)\n> \tunsigned int id = (*iter)->id();\n> \tcallbacks_->camera_device_status_change(callbacks_, id,\n> \t\t\t\t\t\tCAMERA_DEVICE_STATUS_NOT_PRESENT);\n> +\n> +\tif (*iter == cameraInUse_ && cameraInUse_->running()) {\n> +\t\tcameraInUse_->close();\n> +\t\tcameraInUse_.reset();\n> +\t}\n> +\n> \tcameras_.erase(iter);\n> \n> \tLOG(HAL, Debug) << \"Camera ID: \" << id << \" removed successfully.\";\n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index 7c481d4..974d53d 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -48,6 +48,8 @@ private:\n> \tstd::map camerasMap_;\n> \tMutex mutex_;\n> \n> +\tstd::shared_ptr cameraInUse_;\n> +\n\ncameraInUse sounds a bit awkward to me, as I would probably name it\nactiveCamera, but I'm really weary of this as it stands as I think I can\ninfer that it means there is a reference of the camera in the camera\nmanager, but only for a single camera... what happens if there are more\nthan one?!\n\nMaybe open should add a shared ptr to a vector (activeCameras_?), and\nclose should remove it ? Would that fix the issue you are trying to resolve?\n\nOr maybe there are other ways ... not sure yet.\n\n\n> \tunsigned int externalCameraCounter_;\n> \tunsigned int cameraCounter_;\n> };\n>","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 990A0BD87D\n\tfor ;\n\tThu, 13 Aug 2020 14:35:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DE53D613A9;\n\tThu, 13 Aug 2020 16:35: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 562876038C\n\tfor ;\n\tThu, 13 Aug 2020 16:35:19 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A684880C;\n\tThu, 13 Aug 2020 16:35:18 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"XuRWYQD6\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1597329318;\n\tbh=L5stHQv61Wk0Qc7jc3sNYbBL4EeKGBOVHe/soRXEGZM=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=XuRWYQD6bJVGUKwsx8DV6JhdBchzSCwNRgSA0aE//JJMVHShuz264FgC+litT7/Zn\n\tJK3KqMqJFJf36OMvBzBp2Gdr8ppnX+lIOJCZOwfaqWup9yQt9w567w1nOvnD4S2Wlj\n\toFw1gtfOwrgW3N0vb2JuKJwMgc4sLGDiwxzKI2YE=","To":"Umang Jain , libcamera-devel@lists.libcamera.org","References":"<20200810120406.52654-1-email@uajain.com>\n\t<20200810120406.52654-5-email@uajain.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<3dc4e56c-6acc-ff5a-3cd2-2a34780b2b0f@ideasonboard.com>","Date":"Thu, 13 Aug 2020 15:35:16 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20200810120406.52654-5-email@uajain.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2 4/4] android: camera_hal_manager:\n\tHandle hot-unplug of currently open camera","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]