android: camera_device: Make CameraDevice a shared object

CameraDevice needs to be wrapper into the std::shared_ptr instead
of std::unique_ptr to enable refcounting. The refcounting will help
us to support hotplug and hot-unplug CameraHalManager operations
in the subsequent commit.

Signed-off-by: Umang Jain <email@uajain.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Umang Jain 2020-08-21 14:46:08 +00:00 committed by Laurent Pinchart
parent 7197fd9d67
commit f8e2813ffe
4 changed files with 14 additions and 4 deletions

View file

@ -233,6 +233,13 @@ CameraDevice::~CameraDevice()
delete it.second; delete it.second;
} }
std::shared_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);
}
/* /*
* Initialize the camera static information. * Initialize the camera static information.
* This method is called before the camera device is opened. * This method is called before the camera device is opened.

View file

@ -47,7 +47,8 @@ struct CameraStream {
class CameraDevice : protected libcamera::Loggable class CameraDevice : protected libcamera::Loggable
{ {
public: public:
CameraDevice(unsigned int id, const std::shared_ptr<libcamera::Camera> &camera); static std::shared_ptr<CameraDevice> create(unsigned int id,
const std::shared_ptr<libcamera::Camera> &cam);
~CameraDevice(); ~CameraDevice();
int initialize(); int initialize();
@ -72,6 +73,8 @@ protected:
std::string logPrefix() const override; std::string logPrefix() const override;
private: private:
CameraDevice(unsigned int id, const std::shared_ptr<libcamera::Camera> &camera);
struct Camera3RequestDescriptor { struct Camera3RequestDescriptor {
Camera3RequestDescriptor(unsigned int frameNumber, Camera3RequestDescriptor(unsigned int frameNumber,
unsigned int numBuffers); unsigned int numBuffers);

View file

@ -64,12 +64,12 @@ int CameraHalManager::init()
*/ */
unsigned int index = 0; unsigned int index = 0;
for (auto &cam : cameraManager_->cameras()) { for (auto &cam : cameraManager_->cameras()) {
CameraDevice *camera = new CameraDevice(index, cam); std::shared_ptr<CameraDevice> camera = CameraDevice::create(index, cam);
ret = camera->initialize(); ret = camera->initialize();
if (ret) if (ret)
continue; continue;
cameras_.emplace_back(camera); cameras_.emplace_back(std::move(camera));
++index; ++index;
} }

View file

@ -36,7 +36,7 @@ private:
libcamera::CameraManager *cameraManager_; libcamera::CameraManager *cameraManager_;
const camera_module_callbacks_t *callbacks_; const camera_module_callbacks_t *callbacks_;
std::vector<std::unique_ptr<CameraDevice>> cameras_; std::vector<std::shared_ptr<CameraDevice>> cameras_;
}; };
#endif /* __ANDROID_CAMERA_MANAGER_H__ */ #endif /* __ANDROID_CAMERA_MANAGER_H__ */