[libcamera-devel,v3,2/2] libcamera: raspberrypi: Fetch correct value for sensor's modeSensitivity
diff mbox series

Message ID 20220413095342.389460-3-kieran.bingham@ideasonboard.com
State Superseded
Headers show
Series
  • Application support for per-mode sensitivities
Related show

Commit Message

Kieran Bingham April 13, 2022, 9:53 a.m. UTC 
From: David Plowman <david.plowman@raspberrypi.com>

These changes retrieve the correct value for sensitivity of the mode
selected for the sensor. This value is known to the CamHelper which
passes it across to the pipeline handler so that it can be set
correctly in the CameraConfiguration.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
v3
 - [Kieran] - Manually applied patch to account for rebase

Open questions:

 - Should the controls list that gets returned be moved into the
   IPAConfigResult ?

 - Should this modeSensitivity actually be returned during validate?
   (This seems more critical to the design of the patch)

 include/libcamera/ipa/raspberrypi.mojom            |  7 ++++++-
 src/ipa/raspberrypi/raspberrypi.cpp                |  7 +++++--
 src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 10 +++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom
index 5a228b75cd2f..a60c3bb43d3c 100644
--- a/include/libcamera/ipa/raspberrypi.mojom
+++ b/include/libcamera/ipa/raspberrypi.mojom
@@ -38,6 +38,10 @@  struct IPAConfig {
 	libcamera.SharedFD lsTableHandle;
 };
 
+struct IPAConfigResult {
+       float modeSensitivity;
+};
+
 struct StartConfig {
 	libcamera.ControlList controls;
 	int32 dropFrameCount;
@@ -58,6 +62,7 @@  interface IPARPiInterface {
 	 * \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
+	 * \param[out] result Other results that the pipeline handler may require
 	 *
 	 * This function shall be called when the camera is configured to inform
 	 * the IPA of the camera's streams and the sensor settings.
@@ -72,7 +77,7 @@  interface IPARPiInterface {
 		  map<uint32, libcamera.IPAStream> streamConfig,
 		  map<uint32, libcamera.ControlInfoMap> entityControls,
 		  IPAConfig ipaConfig)
-		=> (int32 ret, libcamera.ControlList controls);
+		=> (int32 ret, libcamera.ControlList controls, IPAConfigResult result);
 
 	/**
 	 * \fn mapBuffers()
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 89767a9db471..32a9d5166071 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -97,7 +97,7 @@  public:
 		      const std::map<unsigned int, IPAStream> &streamConfig,
 		      const std::map<unsigned int, ControlInfoMap> &entityControls,
 		      const ipa::RPi::IPAConfig &data,
-		      ControlList *controls) override;
+		      ControlList *controls, ipa::RPi::IPAConfigResult *result) 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;
@@ -342,7 +342,7 @@  int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,
 		      [[maybe_unused]] const std::map<unsigned int, IPAStream> &streamConfig,
 		      const std::map<unsigned int, ControlInfoMap> &entityControls,
 		      const ipa::RPi::IPAConfig &ipaConfig,
-		      ControlList *controls)
+		      ControlList *controls, ipa::RPi::IPAConfigResult *result)
 {
 	if (entityControls.size() != 2) {
 		LOG(IPARPI, Error) << "No ISP or sensor controls found.";
@@ -402,6 +402,9 @@  int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,
 	 */
 	ControlList ctrls(sensorCtrls_);
 
+	/* The pipeline handler passes out the mode's sensitivity. */
+	result->modeSensitivity = mode_.sensitivity;
+
 	if (firstStart_) {
 		/* Supply initial values for frame durations. */
 		applyFrameDurations(defaultMinFrameDuration, defaultMaxFrameDuration);
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index d6148724bdd5..3cba7ba993ad 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -200,7 +200,7 @@  public:
 	void frameStarted(uint32_t sequence);
 
 	int loadIPA(ipa::RPi::SensorConfig *sensorConfig);
-	int configureIPA(const CameraConfiguration *config);
+	int configureIPA(CameraConfiguration *config);
 
 	void enumerateVideoDevices(MediaLink *link);
 
@@ -1528,7 +1528,7 @@  int RPiCameraData::loadIPA(ipa::RPi::SensorConfig *sensorConfig)
 	return ipa_->init(settings, sensorConfig);
 }
 
-int RPiCameraData::configureIPA(const CameraConfiguration *config)
+int RPiCameraData::configureIPA(CameraConfiguration *config)
 {
 	std::map<unsigned int, IPAStream> streamConfig;
 	std::map<unsigned int, ControlInfoMap> entityControls;
@@ -1573,13 +1573,17 @@  int RPiCameraData::configureIPA(const CameraConfiguration *config)
 
 	/* Ready the IPA - it must know about the sensor resolution. */
 	ControlList controls;
+	ipa::RPi::IPAConfigResult result;
 	ret = ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig,
-			      &controls);
+			      &controls, &result);
 	if (ret < 0) {
 		LOG(RPI, Error) << "IPA configuration failed!";
 		return -EPIPE;
 	}
 
+	/* Store the mode sensitivity for the application. */
+	config->modeSensitivity = result.modeSensitivity;
+
 	if (!controls.empty())
 		setSensorControls(controls);