[{"id":15888,"web_url":"https://patchwork.libcamera.org/comment/15888/","msgid":"<20210325083310.a4h2ljtvbmonbeoi@uno.localdomain>","date":"2021-03-25T08:33:10","subject":"Re: [libcamera-devel] [PATCH v2 1/8] android: CameraHalManager:\n\tHold CameraDevice 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:50PM +0900, Hirokazu Honda wrote:\n> CameraDevice is owned by CameraHalManager. The ownership of the\n> object is not shared with other classes. So CameraHalManager\n> should manage CameraDevice with std::unique_ptr.\n>\n> Signed-off-by: Hirokazu Honda \n> Reviewed-by: Laurent Pinchart \n\nIndeed!\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> src/android/camera_device.cpp | 5 ++---\n> src/android/camera_device.h | 2 +-\n> src/android/camera_hal_manager.cpp | 10 ++++------\n> src/android/camera_hal_manager.h | 2 +-\n> 4 files changed, 8 insertions(+), 11 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 72a89258..d0955de7 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -350,11 +350,10 @@ CameraDevice::~CameraDevice()\n> \t\tdelete it.second;\n> }\n>\n> -std::shared_ptr CameraDevice::create(unsigned int id,\n> +std::unique_ptr CameraDevice::create(unsigned int id,\n> \t\t\t\t\t\t const std::shared_ptr &cam)\n> {\n> -\tCameraDevice *camera = new CameraDevice(id, cam);\n> -\treturn std::shared_ptr(camera);\n> +\treturn std::unique_ptr(new CameraDevice(id, cam));\n> }\n>\n> /*\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 823d561c..8be7f305 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -32,7 +32,7 @@\n> class CameraDevice : protected libcamera::Loggable\n> {\n> public:\n> -\tstatic std::shared_ptr create(unsigned int id,\n> +\tstatic std::unique_ptr create(unsigned int id,\n> \t\t\t\t\t\t const std::shared_ptr &cam);\n> \t~CameraDevice();\n>\n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index 189eda2b..b3c85406 100644\n> --- a/src/android/camera_hal_manager.cpp\n> +++ b/src/android/camera_hal_manager.cpp\n> @@ -36,8 +36,6 @@ CameraHalManager::CameraHalManager()\n>\n> CameraHalManager::~CameraHalManager()\n> {\n> -\tcameras_.clear();\n> -\n> \tif (cameraManager_) {\n> \t\tcameraManager_->stop();\n> \t\tdelete cameraManager_;\n> @@ -124,7 +122,7 @@ void CameraHalManager::cameraAdded(std::shared_ptr cam)\n> \t}\n>\n> \t/* Create a CameraDevice instance to wrap the libcamera Camera. */\n> -\tstd::shared_ptr camera = CameraDevice::create(id, std::move(cam));\n> +\tstd::unique_ptr camera = CameraDevice::create(id, std::move(cam));\n> \tint ret = camera->initialize();\n> \tif (ret) {\n> \t\tLOG(HAL, Error) << \"Failed to initialize camera: \" << cam->id();\n> @@ -154,7 +152,7 @@ void CameraHalManager::cameraRemoved(std::shared_ptr cam)\n> \tMutexLocker locker(mutex_);\n>\n> \tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n> -\t\t\t\t [&cam](std::shared_ptr &camera) {\n> +\t\t\t\t [&cam](const std::unique_ptr &camera) {\n> \t\t\t\t\t return cam == camera->camera();\n> \t\t\t\t });\n> \tif (iter == cameras_.end())\n> @@ -191,7 +189,7 @@ int32_t CameraHalManager::cameraLocation(const Camera *cam)\n> CameraDevice *CameraHalManager::cameraDeviceFromHalId(unsigned int id)\n> {\n> \tauto iter = std::find_if(cameras_.begin(), cameras_.end(),\n> -\t\t\t\t [id](std::shared_ptr &camera) {\n> +\t\t\t\t [id](const std::unique_ptr &camera) {\n> \t\t\t\t\t return camera->id() == id;\n> \t\t\t\t });\n> \tif (iter == cameras_.end())\n> @@ -243,7 +241,7 @@ void CameraHalManager::setCallbacks(const camera_module_callbacks_t *callbacks)\n> \t * Internal cameras are already assumed to be present at module load\n> \t * time by the Android framework.\n> \t */\n> -\tfor (std::shared_ptr &camera : cameras_) {\n> +\tfor (const std::unique_ptr &camera : cameras_) {\n> \t\tunsigned int id = camera->id();\n> \t\tif (id >= firstExternalCameraId_)\n> \t\t\tcallbacks_->camera_device_status_change(callbacks_, id,\n> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\n> index a91decc7..65bb3554 100644\n> --- a/src/android/camera_hal_manager.h\n> +++ b/src/android/camera_hal_manager.h\n> @@ -50,7 +50,7 @@ private:\n> \tlibcamera::CameraManager *cameraManager_;\n>\n> \tconst camera_module_callbacks_t *callbacks_;\n> -\tstd::vector> cameras_;\n> +\tstd::vector> cameras_;\n> \tstd::map cameraIdsMap_;\n> \tMutex mutex_;\n>\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 9785DC32E9\n\tfor ;\n\tThu, 25 Mar 2021 08:32:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ECAA668D62;\n\tThu, 25 Mar 2021 09:32:39 +0100 (CET)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7D95D6084F\n\tfor ;\n\tThu, 25 Mar 2021 09:32:38 +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 relay8-d.mail.gandi.net (Postfix) with ESMTPSA id D24E81BF208;\n\tThu, 25 Mar 2021 08:32:36 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","Date":"Thu, 25 Mar 2021 09:33:10 +0100","From":"Jacopo Mondi ","To":"Hirokazu Honda ","Message-ID":"<20210325083310.a4h2ljtvbmonbeoi@uno.localdomain>","References":"<20210324070757.3530377-1-hiroh@chromium.org>\n\t<20210324070757.3530377-2-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210324070757.3530377-2-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 1/8] android: CameraHalManager:\n\tHold CameraDevice 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\" "}}]