NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: camera_manager: Register cameras with the camera manager

Browse source 
Cameras are listed through a double indirection, first iterating over
all available pipeline handlers, and then listing the cameras they each
support. To simplify the API make the pipeline handlers register the
cameras with the camera manager directly, which lets the camera manager
easily expose the list of all available cameras.

The PipelineHandler API gets simplified as the handlers don't need to
expose the list of cameras they have created.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2019-01-03 13:10:37 +02:00
parent 32bf7ef239
commit f3695e9b09
6 changed files with 48 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/libcamera/pipeline/vimc.cpp
View file

@ -6,6 +6,7 @@
*/
#include <libcamera/camera.h>
#include <libcamera/camera_manager.h>
#include "device_enumerator.h"
#include "media_device.h"
@ -19,44 +20,24 @@ public:
PipeHandlerVimc();
~PipeHandlerVimc();
bool match(DeviceEnumerator *enumerator);
unsigned int count();
Camera *camera(unsigned int id) final;
bool match(CameraManager *manager, DeviceEnumerator *enumerator);
private:
MediaDevice *dev_;
Camera *camera_;
};
PipeHandlerVimc::PipeHandlerVimc()
: dev_(nullptr), camera_(nullptr)
: dev_(nullptr)
{
}
PipeHandlerVimc::~PipeHandlerVimc()
{
if (camera_)
camera_->put();
if (dev_)
dev_->release();
}
unsigned int PipeHandlerVimc::count()
{
return 1;
}
Camera *PipeHandlerVimc::camera(unsigned int id)
{
if (id != 0)
return nullptr;
return camera_;
}
bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)
bool PipeHandlerVimc::match(CameraManager *manager, DeviceEnumerator *enumerator)
{
DeviceMatch dm("vimc");
@ -83,7 +64,8 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)
* will be chosen depends on how the Camera
* object is modeled.
*/
camera_ = new Camera("Dummy VIMC Camera");
Camera *camera = new Camera("Dummy VIMC Camera");
manager->addCamera(camera);
return true;
}