diff options
| author | Hirokazu Honda <hiroh@chromium.org> | 2021-03-24 16:07:50 +0900 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-03-25 00:45:25 +0200 |
| commit | 212f410c7c5cdacd18141d9b9234272fb55396d2 (patch) | |
| tree | bcdd611c283a58cf9df68de83bbae36a127a3307 /src/android/camera_device.cpp | |
| parent | 1d8cc0a3ec7dc04958fec12f4fdd05aabd2f7d06 (diff) | |
android: CameraHalManager: Hold CameraDevice with std::unique_ptr
CameraDevice is owned by CameraHalManager. The ownership of the
object is not shared with other classes. So CameraHalManager
should manage CameraDevice with std::unique_ptr.
Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/android/camera_device.cpp')
| -rw-r--r-- | src/android/camera_device.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 72a89258..d0955de7 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -350,11 +350,10 @@ CameraDevice::~CameraDevice() delete it.second; } -std::shared_ptr<CameraDevice> CameraDevice::create(unsigned int id, +std::unique_ptr<CameraDevice> CameraDevice::create(unsigned int id, const std::shared_ptr<Camera> &cam) { - CameraDevice *camera = new CameraDevice(id, cam); - return std::shared_ptr<CameraDevice>(camera); + return std::unique_ptr<CameraDevice>(new CameraDevice(id, cam)); } /* |