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

libcamera: device_enumerator: Use MediaDevice

Browse source 
Replace usage of the DeviceInfo class with MediaDevice in the
DeviceEnumerator and remove the DeviceInfo class.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Jacopo Mondi 2018-12-26 11:15:55 +01:00 • committed by Laurent Pinchart
parent d4af90d729
commit d83269aae0
3 changed files with 54 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@
#include <libcamera/camera.h>
#include "device_enumerator.h"
#include "media_device.h"
#include "pipeline_handler.h"
namespace libcamera {
@ -24,12 +25,12 @@ public:
Camera *camera(unsigned int id) final;
private:
DeviceInfo *info_;
MediaDevice *dev_;
Camera *camera_;
};
PipeHandlerVimc::PipeHandlerVimc()
: info_(nullptr), camera_(nullptr)
: dev_(nullptr), camera_(nullptr)
{
}
@ -38,8 +39,8 @@ PipeHandlerVimc::~PipeHandlerVimc()
if (camera_)
camera_->put();
if (info_)
info_->release();
if (dev_)
dev_->release();
}
unsigned int PipeHandlerVimc::count()
@ -69,15 +70,15 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)
dm.add("RGB/YUV Input");
dm.add("Scaler");
info_ = enumerator->search(dm);
if (!info_)
dev_ = enumerator->search(dm);
if (!dev_)
return false;
info_->acquire();
dev_->acquire();
/*
* NOTE: A more complete Camera implementation could
* be passed the DeviceInfo(s) it controls here or
* be passed the MediaDevice(s) it controls here or
* a reference to the PipelineHandler. Which method
* will be chosen depends on how the Camera
* object is modeled.