Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-23 16:45:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: CameraDevice: Take shared_ptr in constructor

Browse source 
CameraDevice takes the ownership of Camera. Therefore,
shared_ptr would rather be used than const shared_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>
This commit is contained in:
Hirokazu Honda 2021-03-24 16:07:53 +09:00 • committed by Laurent Pinchart
parent 1636d4c438
commit 9538ce4cc6
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/android/camera_device.cpp
View file

@ -312,9 +312,10 @@ CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()
* back to the framework using the designated callbacks. * back to the framework using the designated callbacks.
*/ */
CameraDevice::CameraDevice(unsigned int id, const std::shared_ptr<Camera> &camera) CameraDevice::CameraDevice(unsigned int id, std::shared_ptr<Camera> camera)
: id_(id), running_(false), camera_(camera), staticMetadata_(nullptr), : id_(id), running_(false), camera_(std::move(camera)),
facing_(CAMERA_FACING_FRONT), orientation_(0) staticMetadata_(nullptr), facing_(CAMERA_FACING_FRONT),
orientation_(0)
{ {
camera_->requestCompleted.connect(this, &CameraDevice::requestComplete); camera_->requestCompleted.connect(this, &CameraDevice::requestComplete);
@ -351,9 +352,10 @@ CameraDevice::~CameraDevice()
} }
std::unique_ptr<CameraDevice> CameraDevice::create(unsigned int id, std::unique_ptr<CameraDevice> CameraDevice::create(unsigned int id,
const std::shared_ptr<Camera> &cam) std::shared_ptr<Camera> cam)
{ {
return std::unique_ptr<CameraDevice>(new CameraDevice(id, cam)); return std::unique_ptr<CameraDevice>(
new CameraDevice(id, std::move(cam)));
} }
/* /*

4
src/android/camera_device.h
View file

@ -33,7 +33,7 @@ class CameraDevice : protected libcamera::Loggable
{ {
public: public:
static std::unique_ptr<CameraDevice> create(unsigned int id, static std::unique_ptr<CameraDevice> create(unsigned int id,
const std::shared_ptr<libcamera::Camera> &cam); std::shared_ptr<libcamera::Camera> cam);
~CameraDevice(); ~CameraDevice();
int initialize(); int initialize();
@ -66,7 +66,7 @@ protected:
std::string logPrefix() const override; std::string logPrefix() const override;
private: private:
CameraDevice(unsigned int id, const std::shared_ptr<libcamera::Camera> &camera); CameraDevice(unsigned int id, std::shared_ptr<libcamera::Camera> camera);
struct Camera3RequestDescriptor { struct Camera3RequestDescriptor {
Camera3RequestDescriptor(libcamera::Camera *camera, Camera3RequestDescriptor(libcamera::Camera *camera,