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

libcamera: pipeline: vimc: Use V4L2*::fromEntityName() where possible

Browse source 
Replace manual construction of V4L2VideoDevice and V4L2Subdevide with
the fromEntityName() helper where possible. The returned pointer is
managed as a std::unique_ptr<>, which simplifies the VimcCameraData
destructor.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2020-12-09 13:40:11 +02:00
parent cd4636c14f
commit 1c2b54a017
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,19 +42,13 @@ class VimcCameraData : public CameraData
{ {
public: public:
VimcCameraData(PipelineHandler *pipe, MediaDevice *media) VimcCameraData(PipelineHandler *pipe, MediaDevice *media)
: CameraData(pipe), media_(media), sensor_(nullptr), : CameraData(pipe), media_(media), sensor_(nullptr)
debayer_(nullptr), scaler_(nullptr), video_(nullptr),
raw_(nullptr)
{ {
} }
~VimcCameraData() ~VimcCameraData()
{ {
delete sensor_; delete sensor_;
delete debayer_;
delete scaler_;
delete video_;
delete raw_;
} }
int init(); int init();
@ -62,10 +56,10 @@ public:
MediaDevice *media_; MediaDevice *media_;
CameraSensor *sensor_; CameraSensor *sensor_;
V4L2Subdevice *debayer_; std::unique_ptr<V4L2Subdevice> debayer_;
V4L2Subdevice *scaler_; std::unique_ptr<V4L2Subdevice> scaler_;
V4L2VideoDevice *video_; std::unique_ptr<V4L2VideoDevice> video_;
V4L2VideoDevice *raw_; std::unique_ptr<V4L2VideoDevice> raw_;
Stream stream_; Stream stream_;
}; };
@ -472,21 +466,21 @@ int VimcCameraData::init()
if (ret) if (ret)
return ret; return ret;
debayer_ = new V4L2Subdevice(media_->getEntityByName("Debayer B")); debayer_ = V4L2Subdevice::fromEntityName(media_, "Debayer B");
if (debayer_->open()) if (debayer_->open())
return -ENODEV; return -ENODEV;
scaler_ = new V4L2Subdevice(media_->getEntityByName("Scaler")); scaler_ = V4L2Subdevice::fromEntityName(media_, "Scaler");
if (scaler_->open()) if (scaler_->open())
return -ENODEV; return -ENODEV;
video_ = new V4L2VideoDevice(media_->getEntityByName("RGB/YUV Capture")); video_ = V4L2VideoDevice::fromEntityName(media_, "RGB/YUV Capture");
if (video_->open()) if (video_->open())
return -ENODEV; return -ENODEV;
video_->bufferReady.connect(this, &VimcCameraData::bufferReady); video_->bufferReady.connect(this, &VimcCameraData::bufferReady);
raw_ = new V4L2VideoDevice(media_->getEntityByName("Raw Capture 1")); raw_ = V4L2VideoDevice::fromEntityName(media_, "Raw Capture 1");
if (raw_->open()) if (raw_->open())
return -ENODEV; return -ENODEV;