[libcamera-devel,v3,08/13] android: camera_device: Return Camera as shared_ptr
diff mbox series

Message ID 20201007101745.15104-9-jacopo@jmondi.org
State Accepted
Headers show
Series
  • android: CameraStream rework
Related show

Commit Message

Jacopo Mondi Oct. 7, 2020, 10:17 a.m. UTC 
Return the Camera wrapped by the CameraDevice as a shared_ptr.
This will be required to construct the FrameBuffer allocator in
the CameraStream class.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/android/camera_device.h        | 2 +-
 src/android/camera_hal_manager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox series 

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<libcamera::Camera> 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..2a33f9b17112 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<Camera> cam)
 
 	auto iter = std::find_if(cameras_.begin(), cameras_.end(),
 				 [&cam](std::shared_ptr<CameraDevice> &camera) {
-					 return cam.get() == camera->camera();
+					 return cam == camera->camera();
 				 });
 	if (iter == cameras_.end())
 		return;