diff options
| author | Naushir Patuck <naush@raspberrypi.com> | 2023-01-23 15:49:22 +0000 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2023-01-30 16:30:43 +0000 |
| commit | d70c38dca8ea9b236e764106bad21ccc0a89b54c (patch) | |
| tree | 9a199d700d4e17794d67b6988861908eef2e700c /src | |
| parent | a0701930a8be9900d428a8cbae0414b455b56e97 (diff) | |
pipeline: ipa: raspberrypi: Remove unused streamConfig
Remove the streamConfig parameter from the ipa::configure() call, it is never
used.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ipa/raspberrypi/raspberrypi.cpp | 2 | ||||
| -rw-r--r-- | src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index ec184971..f748b6e2 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -120,7 +120,6 @@ public: void stop() override {} int configure(const IPACameraSensorInfo &sensorInfo, - const std::map<unsigned int, IPAStream> &streamConfig, const std::map<unsigned int, ControlInfoMap> &entityControls, const IPAConfig &data, ControlList *controls, IPAConfigResult *result) override; @@ -382,7 +381,6 @@ void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo) } int IPARPi::configure(const IPACameraSensorInfo &sensorInfo, - [[maybe_unused]] const std::map<unsigned int, IPAStream> &streamConfig, const std::map<unsigned int, ControlInfoMap> &entityControls, const IPAConfig &ipaConfig, ControlList *controls, IPAConfigResult *result) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 8892a1c3..211648bd 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1519,20 +1519,9 @@ int RPiCameraData::loadIPA(ipa::RPi::IPAInitResult *result) int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPAConfigResult *result) { - std::map<unsigned int, IPAStream> streamConfig; std::map<unsigned int, ControlInfoMap> entityControls; ipa::RPi::IPAConfig ipaConfig; - /* Inform IPA of stream configuration and sensor controls. */ - unsigned int i = 0; - for (auto const &stream : isp_) { - if (stream.isExternal()) { - streamConfig[i++] = IPAStream( - stream.configuration().pixelFormat, - stream.configuration().size); - } - } - entityControls.emplace(0, sensor_->controls()); entityControls.emplace(1, isp_[Isp::Input].dev()->controls()); @@ -1562,7 +1551,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPA /* Ready the IPA - it must know about the sensor resolution. */ ControlList controls; - ret = ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig, + ret = ipa_->configure(sensorInfo_, entityControls, ipaConfig, &controls, result); if (ret < 0) { LOG(RPI, Error) << "IPA configuration failed!"; |