PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: media_device: Open and close media device inside populate()

Browse Source 
Remove the need for the caller to open and close the media device when
populating the MediaDevice. This is done as an effort to make the usage
of the MediaDevice less error prone and the interface stricter.

The rework also revealed and fixes a potential memory leak in
MediaDevice::populate() where resources would not be deleted if the
second MEDIA_IOC_G_TOPOLOGY would fail.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2019-04-13 23:58:31 +02:00
parent 12053cf8e6
commit 5868d73e77
5 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/media_device/media_device_print_test.cpp
-6
View File
@@ -124,10 +124,6 @@ int MediaDevicePrintTest::testMediaDevice(const string deviceNode)
dev.close();
ret = dev.open();
if (ret)
return ret;
ret = dev.populate();
if (ret)
return ret;
@@ -135,8 +131,6 @@ int MediaDevicePrintTest::testMediaDevice(const string deviceNode)
/* Print out the media graph. */
printMediaGraph(dev, cerr);
dev.close();
return 0;
}
test/pipeline/ipu3/ipu3_pipeline_test.cpp
-5
View File
@@ -71,11 +71,6 @@ int IPU3PipelineTest::init()
return TestSkip;
}
if (cio2->open()) {
cerr << "Failed to open media device " << cio2->deviceNode() << endl;
return TestFail;
}
/*
* Camera sensor are connected to the CIO2 unit.
* Count how many sensors are connected in the system
test/v4l2_subdevice/v4l2_subdevice_test.cpp
+1 -9
View File
@@ -45,13 +45,6 @@ int V4L2SubdeviceTest::init()
return TestSkip;
}
int ret = media_->open();
if (ret) {
cerr << "Unable to open media device: " << media_->deviceNode()
<< ": " << strerror(ret) << endl;
return TestSkip;
}
MediaEntity *videoEntity = media_->getEntityByName("Scaler");
if (!videoEntity) {
cerr << "Unable to find media entity 'Scaler'" << endl;
@@ -59,8 +52,7 @@ int V4L2SubdeviceTest::init()
}
scaler_ = new V4L2Subdevice(videoEntity);
ret = scaler_->open();
if (ret) {
if (scaler_->open()) {
cerr << "Unable to open video subdevice "
<< scaler_->entity()->deviceNode() << endl;
return TestSkip;