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

ipa: Add sensor model string to IPASettings

Browse Source 
Pass the sensor model string to the IPA init() method through the
IPASettings structure.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Tested-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck
2021-03-23 14:36:04 +00:00
committed by Laurent Pinchart
parent 500c9a1f98
commit ff9f60ce3f
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcamera/pipeline/ipu3/ipu3.cpp
View File

@@ -1144,7 +1144,8 @@ int IPU3CameraData::loadIPA()
ipa_->queueFrameAction.connect(this, &IPU3CameraData::queueFrameAction);
ipa_->init(IPASettings{});
CameraSensor *sensor = cio2_.sensor();
ipa_->init(IPASettings{ "", sensor->model() });
return 0;
}

3
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View File

@@ -1227,7 +1227,8 @@ int RPiCameraData::loadIPA()
ipa_->setIspControls.connect(this, &RPiCameraData::setIspControls);
ipa_->setDelayedControls.connect(this, &RPiCameraData::setDelayedControls);
IPASettings settings(ipa_->configurationFile(sensor_->model() + ".json"));
IPASettings settings(ipa_->configurationFile(sensor_->model() + ".json"),
sensor_->model());
return ipa_->init(settings);
}

16
src/libcamera/pipeline/vimc/vimc.cpp
View File

@@ -422,18 +422,18 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)
std::unique_ptr<VimcCameraData> data = std::make_unique<VimcCameraData>(this, media);
data->ipa_ = IPAManager::createIPA<ipa::vimc::IPAProxyVimc>(this, 0, 0);
if (data->ipa_ != nullptr) {
std::string conf = data->ipa_->configurationFile("vimc.conf");
data->ipa_->init(IPASettings{ conf });
} else {
LOG(VIMC, Warning) << "no matching IPA found";
}
/* Locate and open the capture video node. */
if (data->init())
return false;
data->ipa_ = IPAManager::createIPA<ipa::vimc::IPAProxyVimc>(this, 0, 0);
if (data->ipa_ != nullptr) {
std::string conf = data->ipa_->configurationFile("vimc.conf");
data->ipa_->init(IPASettings{ conf, data->sensor_->model() });
} else {
LOG(VIMC, Warning) << "no matching IPA found";
}
/* Create and register the camera. */
std::set<Stream *> streams{ &data->stream_ };
std::shared_ptr<Camera> camera =