{"id":9977,"url":"https://patchwork.libcamera.org/api/patches/9977/?format=json","web_url":"https://patchwork.libcamera.org/patch/9977/","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":"<20201006144432.22908-9-jacopo@jmondi.org>","date":"2020-10-06T14:44:27","name":"[libcamera-devel,v2,08/13] android: camera_device: Return Camera as shared_ptr","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"baa2fba21c610a1d4b755ce36c9596d7ad43572a","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9977/mbox/","series":[{"id":1356,"url":"https://patchwork.libcamera.org/api/series/1356/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1356","date":"2020-10-06T14:44:19","name":"CameraStream refactor","version":2,"mbox":"https://patchwork.libcamera.org/series/1356/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9977/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9977/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 61FFFBEEE1\n\tfor ;\n\tTue, 6 Oct 2020 14:40:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2048463CD5;\n\tTue, 6 Oct 2020 16:40:49 +0200 (CEST)","from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1958E63CC2\n\tfor ;\n\tTue, 6 Oct 2020 16:40:48 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 38B326000A;\n\tTue, 6 Oct 2020 14:40:47 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 6 Oct 2020 16:44:27 +0200","Message-Id":"<20201006144432.22908-9-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201006144432.22908-1-jacopo@jmondi.org>","References":"<20201006144432.22908-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 08/13] android: camera_device: Return\n\tCamera as shared_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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Return the Camera wrapped by the CameraDevice as a shared_ptr.\nThis will be required to construct the FrameBuffer allocator in\nthe CameraStream class.\n\nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.h | 2 +-\n src/android/camera_hal_manager.cpp | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 826023b453f7..777d1a35e801 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -49,7 +49,7 @@ public:\n \n \tunsigned int id() const { return id_; }\n \tcamera3_device_t *camera3Device() { return &camera3Device_; }\n-\tconst libcamera::Camera *camera() const { return camera_.get(); }\n+\tstd::shared_ptr camera() const { return camera_; }\n \tlibcamera::CameraConfiguration *cameraConfiguration() const\n \t{\n \t\treturn config_.get();\ndiff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\nindex 05b474010b1d..2a33f9b17112 100644\n--- a/src/android/camera_hal_manager.cpp\n+++ b/src/android/camera_hal_manager.cpp\n@@ -155,7 +155,7 @@ void CameraHalManager::cameraRemoved(std::shared_ptr cam)\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\t return cam.get() == camera->camera();\n+\t\t\t\t\t return cam == camera->camera();\n \t\t\t\t });\n \tif (iter == cameras_.end())\n \t\treturn;\n","prefixes":["libcamera-devel","v2","08/13"]}