[{"id":15879,"web_url":"https://patchwork.libcamera.org/comment/15879/","msgid":"","date":"2021-03-24T20:46:18","subject":"Re: [libcamera-devel] [PATCH v2 2/8] android: CameraHalManager:\n\tHold CameraManager with std::unique_ptr","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Wed, Mar 24, 2021 at 04:07:51PM +0900, Hirokazu Honda wrote:\n> CameraManager is owned by CameraHalManager. The ownership of the\n> object is not shared with other classes. So CameraHalManager\n> should manage CameraManager with std::unique_ptr.\n> \n> Signed-off-by: Hirokazu Honda \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/android/camera_hal_manager.cpp | 15 ++++-----------\n> src/android/camera_hal_manager.h | 2 +-\n> 2 files changed, 5 insertions(+), 12 deletions(-)\n> \n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index b3c85406..b501f8db 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -34,18 +34,12 @@ CameraHalManager::CameraHalManager()\n> {\n> }\n> \n> -CameraHalManager::~CameraHalManager()\n> -{\n> -\tif (cameraManager_) {\n> -\t\tcameraManager_->stop();\n> -\t\tdelete cameraManager_;\n> -\t\tcameraManager_ = nullptr;\n> -\t}\n> -}\n> +/* CameraManager calls stop() in the destructor. */\n> +CameraHalManager::~CameraHalManager() = default;\n> \n> int CameraHalManager::init()\n> {\n> -\tcameraManager_ = new CameraManager();\n> +\tcameraManager_ = std::make_unique();\n> \n> \t/* Support camera hotplug. */\n> \tcameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);\n> @@ -55,8 +49,7 @@ int CameraHalManager::init()\n> \tif (ret) {\n> \t\tLOG(HAL, Error) << \"Failed to start camera manager: \"\n> \t\t\t\t<< strerror(-ret);\n> -\t\tdelete cameraManager_;\n> -\t\tcameraManager_ = nullptr;\n> +\t\tcameraManager_.reset();\n> \t\treturn ret;\n> \t}\n> \n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index 65bb3554..dc4e37e5 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -47,7 +47,7 @@ private:\n> \n> \tCameraDevice *cameraDeviceFromHalId(unsigned int id);\n> \n> -\tlibcamera::CameraManager *cameraManager_;\n> +\tstd::unique_ptr cameraManager_;\n> \n> \tconst camera_module_callbacks_t *callbacks_;\n> \tstd::vector> cameras_;","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 1542EC32E5\n\tfor ;\n\tWed, 24 Mar 2021 20:47:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5C21E68D61;\n\tWed, 24 Mar 2021 21:47:04 +0100 (CET)","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 6FD50602E3\n\tfor ;\n\tWed, 24 Mar 2021 21:47:02 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D38B7580;\n\tWed, 24 Mar 2021 21:47:01 +0100 (CET)"],"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=\"heghwK67\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1616618822;\n\tbh=h22EEQDOHFqGV0pJrODxnd3qz/ydILKlmiHu+YCbi08=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=heghwK67AbGbcdI9Jr6yhI3uIvaHd7MVs+wJnb+um6IIDr0ZAhQ1N2s4he8utRjbR\n\tFTIsImb7HksbPnJ1bqdQuqIiHg0JXmY7fPVeEJ+8Xbzdu0iNMwfPzLnAqhXOKb2+Ic\n\tuYDEqKxYE12e0RdAja3yhaQssvAXGzqZJXuOBfHQ=","Date":"Wed, 24 Mar 2021 22:46:18 +0200","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210324070757.3530377-1-hiroh@chromium.org>\n\t<20210324070757.3530377-3-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210324070757.3530377-3-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 2/8] android: CameraHalManager:\n\tHold CameraManager with std::unique_ptr","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":15889,"web_url":"https://patchwork.libcamera.org/comment/15889/","msgid":"<20210325083642.hmddi6msn3ttkkj7@uno.localdomain>","date":"2021-03-25T08:36:42","subject":"Re: [libcamera-devel] [PATCH v2 2/8] android: CameraHalManager:\n\tHold CameraManager with std::unique_ptr","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Hiro,\n\nOn Wed, Mar 24, 2021 at 04:07:51PM +0900, Hirokazu Honda wrote:\n> CameraManager is owned by CameraHalManager. The ownership of the\n> object is not shared with other classes. So CameraHalManager\n> should manage CameraManager with std::unique_ptr.\n>\n> Signed-off-by: Hirokazu Honda \n\nThanks\nReviewed-by: Jacopo Mondi \n\n\n> ---\n> src/android/camera_hal_manager.cpp | 15 ++++-----------\n> src/android/camera_hal_manager.h | 2 +-\n> 2 files changed, 5 insertions(+), 12 deletions(-)\n>\n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index b3c85406..b501f8db 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -34,18 +34,12 @@ CameraHalManager::CameraHalManager()\n> {\n> }\n>\n> -CameraHalManager::~CameraHalManager()\n> -{\n> -\tif (cameraManager_) {\n> -\t\tcameraManager_->stop();\n> -\t\tdelete cameraManager_;\n> -\t\tcameraManager_ = nullptr;\n> -\t}\n> -}\n> +/* CameraManager calls stop() in the destructor. */\n> +CameraHalManager::~CameraHalManager() = default;\n>\n> int CameraHalManager::init()\n> {\n> -\tcameraManager_ = new CameraManager();\n> +\tcameraManager_ = std::make_unique();\n>\n> \t/* Support camera hotplug. */\n> \tcameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);\n> @@ -55,8 +49,7 @@ int CameraHalManager::init()\n> \tif (ret) {\n> \t\tLOG(HAL, Error) << \"Failed to start camera manager: \"\n> \t\t\t\t<< strerror(-ret);\n> -\t\tdelete cameraManager_;\n> -\t\tcameraManager_ = nullptr;\n> +\t\tcameraManager_.reset();\n> \t\treturn ret;\n> \t}\n>\n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index 65bb3554..dc4e37e5 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -47,7 +47,7 @@ private:\n>\n> \tCameraDevice *cameraDeviceFromHalId(unsigned int id);\n>\n> -\tlibcamera::CameraManager *cameraManager_;\n> +\tstd::unique_ptr cameraManager_;\n>\n> \tconst camera_module_callbacks_t *callbacks_;\n> \tstd::vector> cameras_;\n> --\n> 2.31.0.291.g576ba9dcdaf-goog\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 41A1CBDC66\n\tfor ;\n\tThu, 25 Mar 2021 08:36:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C215C68D58;\n\tThu, 25 Mar 2021 09:36:11 +0100 (CET)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E807C68D58\n\tfor ;\n\tThu, 25 Mar 2021 09:36:09 +0100 (CET)","from uno.localdomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 6936E1C0002;\n\tThu, 25 Mar 2021 08:36:09 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","Date":"Thu, 25 Mar 2021 09:36:42 +0100","From":"Jacopo Mondi ","To":"Hirokazu Honda ","Message-ID":"<20210325083642.hmddi6msn3ttkkj7@uno.localdomain>","References":"<20210324070757.3530377-1-hiroh@chromium.org>\n\t<20210324070757.3530377-3-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210324070757.3530377-3-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 2/8] android: CameraHalManager:\n\tHold CameraManager with std::unique_ptr","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]