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

pipeline: ipa: raspberrypi: Remove unused streamConfig

Browse source 
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>
This commit is contained in:
Naushir Patuck 2023-01-23 15:49:22 +00:00 • committed by Kieran Bingham
parent a0701930a8
commit d70c38dca8
3 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/libcamera/ipa/raspberrypi.mojom
View file

@ -59,7 +59,6 @@ interface IPARPiInterface {
* \fn configure() * \fn configure()
* \brief Configure the IPA stream and sensor settings * \brief Configure the IPA stream and sensor settings
* \param[in] sensorInfo Camera sensor information * \param[in] sensorInfo Camera sensor information
* \param[in] streamConfig Configuration of all active streams
* \param[in] entityControls Controls provided by the pipeline entities * \param[in] entityControls Controls provided by the pipeline entities
* \param[in] ipaConfig Pipeline-handler-specific configuration data * \param[in] ipaConfig Pipeline-handler-specific configuration data
* \param[out] controls Controls to apply by the pipeline entity * \param[out] controls Controls to apply by the pipeline entity
@ -75,7 +74,6 @@ interface IPARPiInterface {
* pipeline handler to the IPA and back. * pipeline handler to the IPA and back.
*/ */
configure(libcamera.IPACameraSensorInfo sensorInfo, configure(libcamera.IPACameraSensorInfo sensorInfo,
map<uint32, libcamera.IPAStream> streamConfig,
map<uint32, libcamera.ControlInfoMap> entityControls, map<uint32, libcamera.ControlInfoMap> entityControls,
IPAConfig ipaConfig) IPAConfig ipaConfig)
=> (int32 ret, libcamera.ControlList controls, IPAConfigResult result); => (int32 ret, libcamera.ControlList controls, IPAConfigResult result);

2
src/ipa/raspberrypi/raspberrypi.cpp
View file

@ -120,7 +120,6 @@ public:
void stop() override {} void stop() override {}
int configure(const IPACameraSensorInfo &sensorInfo, int configure(const IPACameraSensorInfo &sensorInfo,
const std::map<unsigned int, IPAStream> &streamConfig,
const std::map<unsigned int, ControlInfoMap> &entityControls, const std::map<unsigned int, ControlInfoMap> &entityControls,
const IPAConfig &data, const IPAConfig &data,
ControlList *controls, IPAConfigResult *result) override; ControlList *controls, IPAConfigResult *result) override;
@ -382,7 +381,6 @@ void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo)
} }
int IPARPi::configure(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 std::map<unsigned int, ControlInfoMap> &entityControls,
const IPAConfig &ipaConfig, const IPAConfig &ipaConfig,
ControlList *controls, IPAConfigResult *result) ControlList *controls, IPAConfigResult *result)

13
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View file

@ -1519,20 +1519,9 @@ int RPiCameraData::loadIPA(ipa::RPi::IPAInitResult *result)
int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPAConfigResult *result) int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPAConfigResult *result)
{ {
std::map<unsigned int, IPAStream> streamConfig;
std::map<unsigned int, ControlInfoMap> entityControls; std::map<unsigned int, ControlInfoMap> entityControls;
ipa::RPi::IPAConfig ipaConfig; 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(0, sensor_->controls());
entityControls.emplace(1, isp_[Isp::Input].dev()->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. */ /* Ready the IPA - it must know about the sensor resolution. */
ControlList controls; ControlList controls;
ret = ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig, ret = ipa_->configure(sensorInfo_, entityControls, ipaConfig,
&controls, result); &controls, result);
if (ret < 0) { if (ret < 0) {
LOG(RPI, Error) << "IPA configuration failed!"; LOG(RPI, Error) << "IPA configuration failed!";