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

libcamera: pipelines: rename MediaDevice member for UVC and VIMC

Browse source 
The name dev_ does a poor job of representing that it holds a media
device, rename it to media_. There is no functional change in this
change just s/dev_/media_/.

Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2019-01-25 15:17:41 +01:00
parent 6013b58fee
commit 25a2f96a28
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libcamera/pipeline/uvcvideo.cpp
View file

@ -22,34 +22,34 @@ public:
bool match(DeviceEnumerator *enumerator); bool match(DeviceEnumerator *enumerator);
private: private:
std::shared_ptr<MediaDevice> dev_; std::shared_ptr<MediaDevice> media_;
}; };
PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager) PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager)
: PipelineHandler(manager), dev_(nullptr) : PipelineHandler(manager), media_(nullptr)
{ {
} }
PipelineHandlerUVC::~PipelineHandlerUVC() PipelineHandlerUVC::~PipelineHandlerUVC()
{ {
if (dev_) if (media_)
dev_->release(); media_->release();
} }
bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator) bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)
{ {
DeviceMatch dm("uvcvideo"); DeviceMatch dm("uvcvideo");
dev_ = std::move(enumerator->search(dm)); media_ = std::move(enumerator->search(dm));
if (!dev_) if (!media_)
return false; return false;
dev_->acquire(); media_->acquire();
std::shared_ptr<Camera> camera = Camera::create(this, dev_->model()); std::shared_ptr<Camera> camera = Camera::create(this, media_->model());
registerCamera(std::move(camera)); registerCamera(std::move(camera));
hotplugMediaDevice(dev_.get()); hotplugMediaDevice(media_.get());
return true; return true;
} }

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

@ -22,18 +22,18 @@ public:
bool match(DeviceEnumerator *enumerator); bool match(DeviceEnumerator *enumerator);
private: private:
std::shared_ptr<MediaDevice> dev_; std::shared_ptr<MediaDevice> media_;
}; };
PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager) PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager)
: PipelineHandler(manager), dev_(nullptr) : PipelineHandler(manager), media_(nullptr)
{ {
} }
PipeHandlerVimc::~PipeHandlerVimc() PipeHandlerVimc::~PipeHandlerVimc()
{ {
if (dev_) if (media_)
dev_->release(); media_->release();
} }
bool PipeHandlerVimc::match(DeviceEnumerator *enumerator) bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)
@ -50,11 +50,11 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)
dm.add("RGB/YUV Input"); dm.add("RGB/YUV Input");
dm.add("Scaler"); dm.add("Scaler");
dev_ = std::move(enumerator->search(dm)); media_ = std::move(enumerator->search(dm));
if (!dev_) if (!media_)
return false; return false;
dev_->acquire(); media_->acquire();
std::shared_ptr<Camera> camera = Camera::create(this, "Dummy VIMC Camera"); std::shared_ptr<Camera> camera = Camera::create(this, "Dummy VIMC Camera");
registerCamera(std::move(camera)); registerCamera(std::move(camera));