diff options
| author | Naushir Patuck <naush@raspberrypi.com> | 2021-03-23 14:36:04 +0000 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-03-23 18:43:58 +0200 |
| commit | ff9f60ce3fef7be119c29d75da4011dcd4b9f4e6 (patch) | |
| tree | 0428cb2c92d582d5443a20ca351326fa950cf494 /src/libcamera/pipeline/vimc | |
| parent | 500c9a1f980d376d15829a2f1a24812ed74a7470 (diff) | |
ipa: Add sensor model string to IPASettings
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>
Diffstat (limited to 'src/libcamera/pipeline/vimc')
| -rw-r--r-- | src/libcamera/pipeline/vimc/vimc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 57c65b02..8f5f4ba3 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -422,18 +422,18 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) std::unique_ptr<VimcCameraData> data = std::make_unique<VimcCameraData>(this, media); + /* 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->ipa_->init(IPASettings{ conf, data->sensor_->model() }); } else { LOG(VIMC, Warning) << "no matching IPA found"; } - /* Locate and open the capture video node. */ - if (data->init()) - return false; - /* Create and register the camera. */ std::set<Stream *> streams{ &data->stream_ }; std::shared_ptr<Camera> camera = |