From 787852a240ae00a5574e7af9341460cec92ce04a Mon Sep 17 00:00:00 2001
From: Naushir Patuck <naush@raspberrypi.com>
Date: Tue, 23 Mar 2021 14:36:10 +0000
Subject: ipa: raspberrypi: Rationalise parameters to ipa::configure()

Rename ConfigInput to IPAConfig to be more consistent with the naming,
and remove ConfigInput::op, as it is never used.

Replace ConfigOutput with a ControlList type, as that is the only return
type from ipa::configure().

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>
---
 src/ipa/raspberrypi/raspberrypi.cpp                | 11 ++++++-----
 src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 13 +++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index b717a83e..1c928b72 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -85,8 +85,8 @@ public:
 	int configure(const CameraSensorInfo &sensorInfo,
 		      const std::map<unsigned int, IPAStream> &streamConfig,
 		      const std::map<unsigned int, ControlInfoMap> &entityControls,
-		      const ipa::RPi::ConfigInput &data,
-		      ipa::RPi::ConfigOutput *response) override;
+		      const ipa::RPi::IPAConfig &data,
+		      ControlList *controls) override;
 	void mapBuffers(const std::vector<IPABuffer> &buffers) override;
 	void unmapBuffers(const std::vector<unsigned int> &ids) override;
 	void signalStatReady(const uint32_t bufferId) override;
@@ -313,8 +313,8 @@ void IPARPi::setMode(const CameraSensorInfo &sensorInfo)
 int IPARPi::configure(const CameraSensorInfo &sensorInfo,
 		      [[maybe_unused]] const std::map<unsigned int, IPAStream> &streamConfig,
 		      const std::map<unsigned int, ControlInfoMap> &entityControls,
-		      const ipa::RPi::ConfigInput &ipaConfig,
-		      ipa::RPi::ConfigOutput *result)
+		      const ipa::RPi::IPAConfig &ipaConfig,
+		      ControlList *controls)
 {
 	if (entityControls.size() != 2) {
 		LOG(IPARPI, Error) << "No ISP or sensor controls found.";
@@ -377,7 +377,8 @@ int IPARPi::configure(const CameraSensorInfo &sensorInfo,
 		agcStatus.analogue_gain = DefaultAnalogueGain;
 		applyAGC(&agcStatus, ctrls);
 
-		result->controls = std::move(ctrls);
+		ASSERT(controls);
+		*controls = std::move(ctrls);
 	}
 
 	return 0;
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index a65d5389..2cac802c 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1236,7 +1236,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)
 
 	std::map<unsigned int, IPAStream> streamConfig;
 	std::map<unsigned int, ControlInfoMap> entityControls;
-	ipa::RPi::ConfigInput ipaConfig;
+	ipa::RPi::IPAConfig ipaConfig;
 
 	/* Get the device format to pass to the IPA. */
 	V4L2DeviceFormat sensorFormat;
@@ -1279,19 +1279,16 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)
 	}
 
 	/* Ready the IPA - it must know about the sensor resolution. */
-	ipa::RPi::ConfigOutput result;
-
+	ControlList controls;
 	ret = ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig,
-			      &result);
+			      &controls);
 	if (ret < 0) {
 		LOG(RPI, Error) << "IPA configuration failed!";
 		return -EPIPE;
 	}
 
-	if (!result.controls.empty()) {
-		ControlList &ctrls = result.controls;
-		unicam_[Unicam::Image].dev()->setControls(&ctrls);
-	}
+	if (!controls.empty())
+		unicam_[Unicam::Image].dev()->setControls(&controls);
 
 	/*
 	 * Configure the H/V flip controls based on the combination of
-- 
cgit v1.2.1