Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-13 15:29:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: Always check return value of MediaDevice::acquire()

Browse source 
In preparation for adding more responsibility to MediaDevice::acquire()
remove unneeded calls to acquire() and release(), and make sure all
needed calls to acquire() are checked and acted on.

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-04-14 00:28:53 +02:00
parent b9a47058eb
commit 12053cf8e6
6 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/v4l2_subdevice/v4l2_subdevice_test.cpp
View file

@ -45,20 +45,16 @@ int V4L2SubdeviceTest::init()
return TestSkip;
}
media_->acquire();
int ret = media_->open();
if (ret) {
cerr << "Unable to open media device: " << media_->deviceNode()
<< ": " << strerror(ret) << endl;
media_->release();
return TestSkip;
}
MediaEntity *videoEntity = media_->getEntityByName("Scaler");
if (!videoEntity) {
cerr << "Unable to find media entity 'Scaler'" << endl;
media_->release();
return TestFail;
}
@ -67,7 +63,6 @@ int V4L2SubdeviceTest::init()
if (ret) {
cerr << "Unable to open video subdevice "
<< scaler_->entity()->deviceNode() << endl;
media_->release();
return TestSkip;
}
@ -76,7 +71,5 @@ int V4L2SubdeviceTest::init()
void V4L2SubdeviceTest::cleanup()
{
media_->release();
delete scaler_;
}