From patchwork Mon Oct 5 10:46:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9955 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 25422C3B5D for ; Mon, 5 Oct 2020 10:47:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E5C5C63C55; Mon, 5 Oct 2020 12:47:41 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="TtDLmnXq"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BAB4A63B29 for ; Mon, 5 Oct 2020 12:47:36 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4728C3B; Mon, 5 Oct 2020 12:47:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1601894856; bh=hE1fRxS0Pzp6zORaf/amSh2fNu+Jhs7mi4LD2MTeV4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TtDLmnXqH33EBqoQ7DUHsZhuhYu3iar9R3Tn7gSfaUnm1cAFBKODSYEocPvzR+Nb5 7s35yOi3en4soef2AMgdaxduwhUfYjtjDN6wp4ut1vcJENp3i0C/ISXmxXXN+gdgR+ ri6KkCrsJHbxdYeMNuE72KL7A0hP/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 Camera as shared_ptr X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Jacopo Mondi Return the Camera wrapped by the CameraDevice as a shared_ptr. This will be required to construct the FrameBuffer allocator in the CameraStream class. Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/android/camera_device.h | 2 +- src/android/camera_hal_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 826023b453f7..777d1a35e801 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -49,7 +49,7 @@ public: unsigned int id() const { return id_; } camera3_device_t *camera3Device() { return &camera3Device_; } - const libcamera::Camera *camera() const { return camera_.get(); } + std::shared_ptr camera() const { return camera_; } libcamera::CameraConfiguration *cameraConfiguration() const { return config_.get(); diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index 05b474010b1d..e29eddbb5590 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -155,7 +155,7 @@ void CameraHalManager::cameraRemoved(std::shared_ptr cam) auto iter = std::find_if(cameras_.begin(), cameras_.end(), [&cam](std::shared_ptr &camera) { - return cam.get() == camera->camera(); + return cam.get() == camera->camera().get(); }); if (iter == cameras_.end()) return;