[{"id":12977,"web_url":"https://patchwork.libcamera.org/comment/12977/","msgid":"<20201005121716.GJ3931@pendragon.ideasonboard.com>","date":"2020-10-05T12:17:16","subject":"Re: [libcamera-devel] [PATCH 08/15] android: camera_device: Return\n\tCamera as shared_ptr","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Mon, Oct 05, 2020 at 01:46:42PM +0300, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n> \n> Return the Camera wrapped by the CameraDevice as a shared_ptr.\n> This will be required to construct the FrameBuffer allocator in\n> the CameraStream class.\n> \n> Signed-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(-)\n> \n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index 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();\n> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n> index 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\nMaybe just return cam == camera->camera() ?\n\nReviewed-by: Laurent Pinchart \n\n> \t\t\t\t });\n> \tif (iter == cameras_.end())\n> \t\treturn;","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 508E0C3B5C\n\tfor ;\n\tMon, 5 Oct 2020 12:17:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D985463C13;\n\tMon, 5 Oct 2020 14:17:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4C19363BD5\n\tfor ;\n\tMon, 5 Oct 2020 14:17:56 +0200 (CEST)","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 C81843B\n\tfor ;\n\tMon, 5 Oct 2020 14:17:55 +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=\"dEmlQ0iW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601900276;\n\tbh=qignLxg9iv6ojHLNIGo6riR3/hLc0jm0W2igHyzhLeU=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=dEmlQ0iWfJIN7g2NBwttIq33nUEOWDc3Qk7peTUypc4iBQPLLe2LcVtAMhTsZ1Mvm\n\tiP+cLNroUXrzXmJwdrUyw41CAuDpwZvKxxraAVHHF3F2qIpcV9tEDqgJfJFk395jRq\n\t9Kx4q0h/fFf+gx9eBfKbe4YeutYNBC/8QouSU3Rk=","Date":"Mon, 5 Oct 2020 15:17:16 +0300","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Message-ID":"<20201005121716.GJ3931@pendragon.ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-9-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201005104649.10812-9-laurent.pinchart@ideasonboard.com>","Subject":"Re: [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\" "}},{"id":13002,"web_url":"https://patchwork.libcamera.org/comment/13002/","msgid":"<5ff99bfe-c0d6-1923-925d-b25ae61be67f@ideasonboard.com>","date":"2020-10-06T10:17:00","subject":"Re: [libcamera-devel] [PATCH 08/15] android: camera_device: Return\n\tCamera as shared_ptr","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 05/10/2020 13:17, Laurent Pinchart wrote:\n> Hi Jacopo,\n> \n> Thank you for the patch.\n> \n> On Mon, Oct 05, 2020 at 01:46:42PM +0300, Laurent Pinchart wrote:\n>> From: Jacopo Mondi \n>>\n>> Return the Camera wrapped by the CameraDevice as a shared_ptr.\n>> This will be required to construct the FrameBuffer allocator in\n>> the CameraStream class.\n\nSounds good to me.\n\n>>\n>> Signed-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(-)\n>>\n>> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n>> index 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();\n>> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp\n>> index 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> \n> Maybe just return cam == camera->camera() ?\n> \n> Reviewed-by: Laurent Pinchart \n\nWith the simplified comparison:\n\nReviewed-by: Kieran Bingham \n\n> \n>> \t\t\t\t });\n>> \tif (iter == cameras_.end())\n>> \t\treturn;\n>","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 E6EB8BEEE0\n\tfor ;\n\tTue, 6 Oct 2020 10:17:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 62A0863BFE;\n\tTue, 6 Oct 2020 12:17:05 +0200 (CEST)","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 7FEC660363\n\tfor ;\n\tTue, 6 Oct 2020 12:17:04 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EC3093B;\n\tTue, 6 Oct 2020 12:17:03 +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=\"O5mKAdz1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601979424;\n\tbh=kIozqxOiIkzMX8AT6Ea/mW0LrNC1SSXSkeWiWK32uJI=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=O5mKAdz1Bekqm+PKg/v5cvibSdhqaoVx9tIlUlhTucEJ0r9845jBfzcOWkc3docHz\n\txdKQlSYiBOfo78voDfLjYvKrC+Ow/QS48oZnC+UkjaocC/0fsrF23UdrK1lh7hK/AL\n\thSBdM7/AqaAt09o1CHE7tCV384cj7q0k/jNUciEA=","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>\n\t<20201005104649.10812-9-laurent.pinchart@ideasonboard.com>\n\t<20201005121716.GJ3931@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<5ff99bfe-c0d6-1923-925d-b25ae61be67f@ideasonboard.com>","Date":"Tue, 6 Oct 2020 11:17:00 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201005121716.GJ3931@pendragon.ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]