{"id":9333,"url":"https://patchwork.libcamera.org/api/patches/9333/?format=json","web_url":"https://patchwork.libcamera.org/patch/9333/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200817202629.4277-4-email@uajain.com>","date":"2020-08-17T20:26:39","name":"[libcamera-devel,v3,3/5] android: camera_device: Make CameraDevice a shared object","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3e9b25ccbae07eaa655e84f0d98eff7ac41e0b6d","submitter":{"id":1,"url":"https://patchwork.libcamera.org/api/people/1/?format=json","name":"Umang Jain","email":"email@uajain.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9333/mbox/","series":[{"id":1224,"url":"https://patchwork.libcamera.org/api/series/1224/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1224","date":"2020-08-17T20:26:35","name":"android: Camera hotplug support","version":3,"mbox":"https://patchwork.libcamera.org/series/1224/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9333/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9333/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 7819EBD87F\n\tfor ;\n\tMon, 17 Aug 2020 20:26:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6B94A619C0;\n\tMon, 17 Aug 2020 22:26:43 +0200 (CEST)","from o1.f.az.sendgrid.net (o1.f.az.sendgrid.net [208.117.55.132])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 67C0661815\n\tfor ;\n\tMon, 17 Aug 2020 22:26:40 +0200 (CEST)","by filterdrecv-p3iad2-5c98798b7-zrzkk with SMTP id\n\tfilterdrecv-p3iad2-5c98798b7-zrzkk-19-5F3AE7FE-53\n\t2020-08-17 20:26:38.938016394 +0000 UTC m=+359824.402835252","from mail.uajain.com (unknown)\n\tby ismtpd0002p1maa1.sendgrid.net (SG) with ESMTP id\n\tH_tfatOXSeKXc3rObZtlkw for ;\n\tMon, 17 Aug 2020 20:26:38.202 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"cp50GDrd\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=uajain.com;\n\th=from:subject:in-reply-to:references:mime-version:to:cc:\n\tcontent-transfer-encoding:content-type;\n\ts=s1; bh=FXhILTUfxT0BFUBPIZ20p2fiVt6QYftLfIfgckevdHQ=;\n\tb=cp50GDrdPf/uPB/JhjKak/q57OCcTZtsnRSjvBc6C2c1Iz9LOGLa+G9ftWYEdNMT+/em\n\t+UvPmZNJIoiu/OR9Us6L5JFHu8IftSXKB3KxrsE+KVPWybLMgf2gSTQYSxRF15ORYxHqYD\n\tviEXlVw8buii8rTFiNjm19C+ZzbRkJNAc=","From":"Umang Jain ","Date":"Mon, 17 Aug 2020 20:26:39 +0000 (UTC)","Message-Id":"<20200817202629.4277-4-email@uajain.com>","In-Reply-To":"<20200817202629.4277-1-email@uajain.com>","References":"<20200817202629.4277-1-email@uajain.com>","Mime-Version":"1.0","X-SG-EID":"1Q40EQ7YGir8a9gjSIAdTjhngY657NMk9ckeo4dbHZDiOpywc/L3L9rFqlwE4KPcBLpXFhl3+P87RHKL8hWvbIAmAXRqUBwWps8sj3eeReFPzR4KyTXBMlaA8eMkSd1eF+xxDt70e6FDslqNdafPQle2hNeTap9WDXERFDRrTQHe9ZQ3W8ayVcVSPZrRuDnpzjP4zHPlXEeXS96hdv25e1FXEG7TOI0TIUcQjCLmzL+h6menKj1manAhsAj4miaabBfNo0kAvJoHXwVuhOcYZA==","To":"libcamera-devel@lists.libcamera.org","Subject":"[libcamera-devel] [PATCH v3 3/5] android: camera_device: Make\n\tCameraDevice a shared object","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"CameraDevice needs to be wrapper into the std::shared_ptr instead\nof std::unique_ptr to enable refcounting. The refcounting will help\nus to support hotplug and hot-unplug CameraHalManager operations\nin the subsequent commit.\n\nSigned-off-by: Umang Jain \n---\n src/android/camera_device.cpp | 15 +++++++++++++++\n src/android/camera_device.h | 7 +++++--\n src/android/camera_hal_manager.cpp | 4 ++--\n src/android/camera_hal_manager.h | 2 +-\n 4 files changed, 23 insertions(+), 5 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex d918350..a79bb69 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -233,6 +233,21 @@ CameraDevice::~CameraDevice()\n \t\tdelete it.second;\n }\n \n+std::shared_ptr CameraDevice::create(unsigned int id,\n+\t\t\t\t\t\t const std::shared_ptr &cam)\n+{\n+\tstruct Deleter : std::default_delete {\n+\t\tvoid operator()(CameraDevice *camera)\n+\t\t{\n+\t\t\tdelete camera;\n+\t\t}\n+\t};\n+\n+\tCameraDevice *camera = new CameraDevice(id, cam);\n+\n+\treturn std::shared_ptr(camera, Deleter());\n+}\n+\n /*\n * Initialize the camera static information.\n * This method is called before the camera device is opened.\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 7be9e11..b149043 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -47,8 +47,8 @@ struct CameraStream {\n class CameraDevice : protected libcamera::Loggable\n {\n public:\n-\tCameraDevice(unsigned int id, const std::shared_ptr &camera);\n-\t~CameraDevice();\n+\tstatic std::shared_ptr create(unsigned int id,\n+\t\t\t\t\t\t const std::shared_ptr &cam);\n \n \tint initialize();\n \n@@ -72,6 +72,9 @@ protected:\n \tstd::string logPrefix() const override;\n \n private:\n+\tCameraDevice(unsigned int id, const std::shared_ptr &camera);\n+\t~CameraDevice();\n+\n \tstruct Camera3RequestDescriptor {\n \t\tCamera3RequestDescriptor(unsigned int frameNumber,\n \t\t\t\t\t unsigned int numBuffers);\ndiff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\nindex 3d6d2b4..3a744af 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -64,12 +64,12 @@ int CameraHalManager::init()\n \t */\n \tunsigned int index = 0;\n \tfor (auto &cam : cameraManager_->cameras()) {\n-\t\tCameraDevice *camera = new CameraDevice(index, cam);\n+\t\tstd::shared_ptr camera = CameraDevice::create(index, cam);\n \t\tret = camera->initialize();\n \t\tif (ret)\n \t\t\tcontinue;\n \n-\t\tcameras_.emplace_back(camera);\n+\t\tcameras_.emplace_back(std::move(camera));\n \t\t++index;\n \t}\n \ndiff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h\nindex a582f04..3e34d63 100644\n--- a/src/android/camera_hal_manager.h\n+++ b/src/android/camera_hal_manager.h\n@@ -36,7 +36,7 @@ private:\n \tlibcamera::CameraManager *cameraManager_;\n \n \tconst camera_module_callbacks_t *callbacks_;\n-\tstd::vector> cameras_;\n+\tstd::vector> cameras_;\n };\n \n #endif /* __ANDROID_CAMERA_MANAGER_H__ */\n","prefixes":["libcamera-devel","v3","3/5"]}