{"id":9955,"url":"https://patchwork.libcamera.org/api/1.1/patches/9955/?format=json","web_url":"https://patchwork.libcamera.org/patch/9955/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20201005104649.10812-9-laurent.pinchart@ideasonboard.com>","date":"2020-10-05T10:46:42","name":"[libcamera-devel,08/15] android: camera_device: Return Camera as shared_ptr","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0e2649b88c5603e655c3c677b39378a91c942b97","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9955/mbox/","series":[{"id":1349,"url":"https://patchwork.libcamera.org/api/1.1/series/1349/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1349","date":"2020-10-05T10:46:34","name":"CameraStream refactoring","version":1,"mbox":"https://patchwork.libcamera.org/series/1349/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9955/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9955/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 25422C3B5D\n\tfor ;\n\tMon, 5 Oct 2020 10:47:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E5C5C63C55;\n\tMon, 5 Oct 2020 12:47:41 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BAB4A63B29\n\tfor ;\n\tMon, 5 Oct 2020 12:47:36 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4728C3B;\n\tMon, 5 Oct 2020 12:47:36 +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=\"TtDLmnXq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601894856;\n\tbh=hE1fRxS0Pzp6zORaf/amSh2fNu+Jhs7mi4LD2MTeV4Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=TtDLmnXqH33EBqoQ7DUHsZhuhYu3iar9R3Tn7gSfaUnm1cAFBKODSYEocPvzR+Nb5\n\t7s35yOi3en4soef2AMgdaxduwhUfYjtjDN6wp4ut1vcJENp3i0C/ISXmxXXN+gdgR+\n\tri6KkCrsJHbxdYeMNuE72KL7A0hP/ZPXpwiA2Viw=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 5 Oct 2020 13:46:42 +0300","Message-Id":"<20201005104649.10812-9-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 08/15] 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":"From: Jacopo Mondi \n\nReturn the Camera wrapped by the CameraDevice as a shared_ptr.\nThis will be required to construct the FrameBuffer allocator in\nthe CameraStream class.\n\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..e29eddbb5590 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.get() == camera->camera().get();\n \t\t\t\t });\n \tif (iter == cameras_.end())\n \t\treturn;\n","prefixes":["libcamera-devel","08/15"]}