[libcamera-devel,v2,02/14] pipeline: ipa: raspberrypi: Remove unused streamConfig
diff mbox series

Message ID 20230123154934.27803-3-naush@raspberrypi.com
State Accepted
Commit d70c38dca8ea9b236e764106bad21ccc0a89b54c
Headers show
Series
  • Raspberry Pi: Camera Module 3 support
Related show

Commit Message

Naushir Patuck Jan. 23, 2023, 3:49 p.m. UTC 
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>
---
 include/libcamera/ipa/raspberrypi.mojom            |  2 --
 src/ipa/raspberrypi/raspberrypi.cpp                |  2 --
 src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 13 +------------
 3 files changed, 1 insertion(+), 16 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom
index e7dabcbe5313..0732496968ed 100644
--- a/include/libcamera/ipa/raspberrypi.mojom
+++ b/include/libcamera/ipa/raspberrypi.mojom
@@ -59,7 +59,6 @@  interface IPARPiInterface {
 	 * \fn configure()
 	 * \brief Configure the IPA stream and sensor settings
 	 * \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] ipaConfig Pipeline-handler-specific configuration data
 	 * \param[out] controls Controls to apply by the pipeline entity
@@ -75,7 +74,6 @@  interface IPARPiInterface {
 	 * pipeline handler to the IPA and back.
 	 */
 	configure(libcamera.IPACameraSensorInfo sensorInfo,
-		  map<uint32, libcamera.IPAStream> streamConfig,
 		  map<uint32, libcamera.ControlInfoMap> entityControls,
 		  IPAConfig ipaConfig)
 		=> (int32 ret, libcamera.ControlList controls, IPAConfigResult result);
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index ec18497155ba..f748b6e2dac7 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 62417669bdc5..272767b5263b 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1612,20 +1612,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());
 
@@ -1655,7 +1644,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!";