libipa: FCQueue: Initialize FrameContext with activeState

Pass to the FCQueue the algorithm's active state to use the most
recent state of IPA algorithms to initialize a FrameContext.

Modify all IPA modules that use libipa to pass a const ActiveState
reference to the FCQueue function and make their IPAActiveState
implementation derive a base ActiveState structure.

Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

9 files changed, 48 insertions, 25 deletions

diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h
index c85d1e34..526af2ac 100644
--- a/src/ipa/ipu3/ipa_context.h
+++ b/src/ipa/ipu3/ipa_context.h
@@ -46,7 +46,7 @@ struct IPASessionConfiguration {
 	} sensor;
 };
 
-struct IPAActiveState {
+struct IPAActiveState : public ActiveState {
 	struct {
 		uint32_t focus;
 		double maxVariance;
diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp
index 10a8c86d..84c443a0 100644
--- a/src/ipa/ipu3/ipu3.cpp
+++ b/src/ipa/ipu3/ipu3.cpp
@@ -561,7 +561,8 @@ void IPAIPU3::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)
 	 */
 	params->use = {};
 
-	IPAFrameContext &frameContext = context_.frameContexts.get(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.get(frame,
+								   context_.activeState);
 
 	for (auto const &algo : algorithms())
 		algo->prepare(context_, frame, frameContext, params);
@@ -594,7 +595,8 @@ void IPAIPU3::processStatsBuffer(const uint32_t frame,
 	const ipu3_uapi_stats_3a *stats =
 		reinterpret_cast<ipu3_uapi_stats_3a *>(mem.data());
 
-	IPAFrameContext &frameContext = context_.frameContexts.get(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.get(frame,
+								   context_.activeState);
 
 	frameContext.sensor.exposure = sensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();
 	frameContext.sensor.gain = camHelper_->gain(sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>());
@@ -627,7 +629,8 @@ void IPAIPU3::processStatsBuffer(const uint32_t frame,
  */
 void IPAIPU3::queueRequest(const uint32_t frame, const ControlList &controls)
 {
-	IPAFrameContext &frameContext = context_.frameContexts.alloc(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.alloc(frame,
+								     context_.activeState);
 
 	for (auto const &algo : algorithms())
 		algo->queueRequest(context_, frame, frameContext, controls);
diff --git a/src/ipa/libipa/fc_queue.cpp b/src/ipa/libipa/fc_queue.cpp
index fa2454fd..56c7c75a 100644
--- a/src/ipa/libipa/fc_queue.cpp
+++ b/src/ipa/libipa/fc_queue.cpp
@@ -42,6 +42,7 @@ namespace ipa {
  * \fn FrameContext::init()
  * \brief Initialize a frame context
  * \param[in] frameNum The frame number to assign to this FrameContext
+ * \param[in] activeState The IPA current active state
  *
  * This function initializes a frame context by assigning it a frame number.
  * The single IPA modules are expected to override this function to initialize
@@ -117,9 +118,10 @@ namespace ipa {
  */
 
 /**
- * \fn FCQueue::alloc(uint32_t frame)
+ * \fn FCQueue::alloc(uint32_t frame, const ActiveState &activeState)
  * \brief Allocate and return a FrameContext for the \a frame
  * \param[in] frame The frame context sequence number
+ * \param[in] activeState The IPA current active state
  *
  * The first call to obtain a FrameContext from the FCQueue should be handled
  * through this function. The FrameContext will be initialised, if not
@@ -135,12 +137,14 @@ namespace ipa {
  */
 
 /**
- * \fn FCQueue::get(uint32_t frame)
+ * \fn FCQueue::get(uint32_t frame, const ActiveState &activeState)
  * \brief Obtain the FrameContext for the \a frame
  * \param[in] frame The frame context sequence number
+ * \param[in] activeState The IPA current active state
  *
  * If the FrameContext is not correctly initialised for the \a frame, it will be
- * initialised.
+ * initialised using the most current state of IPA algorithm contained in
+ * \a activeState.
  *
  * \return A reference to the FrameContext for sequence \a frame
  */
diff --git a/src/ipa/libipa/fc_queue.h b/src/ipa/libipa/fc_queue.h
index bfcce5a8..48842e54 100644
--- a/src/ipa/libipa/fc_queue.h
+++ b/src/ipa/libipa/fc_queue.h
@@ -21,9 +21,16 @@ namespace ipa {
 template<typename FrameContext>
 class FCQueue;
 
+struct ActiveState {
+};
+
 struct FrameContext {
+public:
+	virtual ~FrameContext() = default;
+
 protected:
-	virtual void init(const uint32_t frameNum)
+	virtual void init(const uint32_t frameNum,
+			  [[maybe_unused]] const ActiveState &activeState)
 	{
 		frame = frameNum;
 		initialised = true;
@@ -52,7 +59,7 @@ public:
 		}
 	}
 
-	FrameContext &alloc(const uint32_t frame)
+	FrameContext &alloc(const uint32_t frame, const ActiveState &activeState)
 	{
 		FrameContext &frameContext = contexts_[frame % contexts_.size()];
 
@@ -71,12 +78,12 @@ public:
 			LOG(FCQueue, Warning)
 				<< "Frame " << frame << " already initialised";
 		else
-			frameContext.init(frame);
+			frameContext.init(frame, activeState);
 
 		return frameContext;
 	}
 
-	FrameContext &get(uint32_t frame)
+	FrameContext &get(uint32_t frame, const ActiveState &activeState)
 	{
 		FrameContext &frameContext = contexts_[frame % contexts_.size()];
 
@@ -103,7 +110,7 @@ public:
 			 * Make sure the FrameContext gets initialised if get()
 			 * is called before alloc() by the IPA for frame#0.
 			 */
-			frameContext.init(frame);
+			frameContext.init(frame, activeState);
 
 			return frameContext;
 		}
@@ -123,7 +130,7 @@ public:
 		LOG(FCQueue, Warning)
 			<< "Obtained an uninitialised FrameContext for " << frame;
 
-		frameContext.init(frame);
+		frameContext.init(frame, activeState);
 
 		return frameContext;
 	}
diff --git a/src/ipa/rkisp1/ipa_context.cpp b/src/ipa/rkisp1/ipa_context.cpp
index 4e4fe5f4..2dad42b3 100644
--- a/src/ipa/rkisp1/ipa_context.cpp
+++ b/src/ipa/rkisp1/ipa_context.cpp
@@ -417,9 +417,10 @@ namespace libcamera::ipa::rkisp1 {
  * \brief Analogue gain multiplier
  */
 
-void IPAFrameContext::init(const uint32_t frameNum)
+void IPAFrameContext::init(const uint32_t frameNum,
+			   const ActiveState &activeState)
 {
-	FrameContext::init(frameNum);
+	FrameContext::init(frameNum, activeState);
 }
 
 /**
diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h
index 51e04bc3..f708b321 100644
--- a/src/ipa/rkisp1/ipa_context.h
+++ b/src/ipa/rkisp1/ipa_context.h
@@ -64,7 +64,7 @@ struct IPASessionConfiguration {
 	uint32_t paramFormat;
 };
 
-struct IPAActiveState {
+struct IPAActiveState : public ActiveState {
 	struct {
 		struct {
 			uint32_t exposure;
@@ -178,7 +178,8 @@ struct IPAFrameContext : public FrameContext {
 		Matrix<float, 3, 3> ccm;
 	} ccm;
 
-	void init(const uint32_t frame) override;
+	void init(const uint32_t frame,
+		  const ActiveState &activeState) override;
 };
 
 struct IPAContext {
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
index 9e161cab..7c1cefc1 100644
--- a/src/ipa/rkisp1/rkisp1.cpp
+++ b/src/ipa/rkisp1/rkisp1.cpp
@@ -325,7 +325,8 @@ void IPARkISP1::unmapBuffers(const std::vector<unsigned int> &ids)
 
 void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)
 {
-	IPAFrameContext &frameContext = context_.frameContexts.alloc(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.alloc(frame,
+								     context_.activeState);
 
 	for (auto const &a : algorithms()) {
 		Algorithm *algo = static_cast<Algorithm *>(a.get());
@@ -337,7 +338,8 @@ void IPARkISP1::queueRequest(const uint32_t frame, const ControlList &controls)
 
 void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)
 {
-	IPAFrameContext &frameContext = context_.frameContexts.get(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.get(frame,
+								   context_.activeState);
 
 	RkISP1Params params(context_.configuration.paramFormat,
 			    mappedBuffers_.at(bufferId).planes()[0]);
@@ -351,7 +353,8 @@ void IPARkISP1::fillParamsBuffer(const uint32_t frame, const uint32_t bufferId)
 void IPARkISP1::processStatsBuffer(const uint32_t frame, const uint32_t bufferId,
 				   const ControlList &sensorControls)
 {
-	IPAFrameContext &frameContext = context_.frameContexts.get(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.get(frame,
+								   context_.activeState);
 
 	/*
 	 * In raw capture mode, the ISP is bypassed and no statistics buffer is
@@ -447,7 +450,8 @@ void IPARkISP1::setControls(unsigned int frame)
 	 * internal sensor delays and other timing parameters into account.
 	 */
 
-	IPAFrameContext &frameContext = context_.frameContexts.get(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.get(frame,
+								   context_.activeState);
 	uint32_t exposure = frameContext.agc.exposure;
 	uint32_t gain = context_.camHelper->gainCode(frameContext.agc.gain);
 
diff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h
index fd121eeb..9319d776 100644
--- a/src/ipa/simple/ipa_context.h
+++ b/src/ipa/simple/ipa_context.h
@@ -28,7 +28,7 @@ struct IPASessionConfiguration {
 	} black;
 };
 
-struct IPAActiveState {
+struct IPAActiveState : public ActiveState {
 	struct {
 		uint8_t level;
 	} blc;
diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp
index c8ad55a2..e8dbce7d 100644
--- a/src/ipa/simple/soft_simple.cpp
+++ b/src/ipa/simple/soft_simple.cpp
@@ -266,7 +266,8 @@ void IPASoftSimple::stop()
 
 void IPASoftSimple::queueRequest(const uint32_t frame, const ControlList &controls)
 {
-	IPAFrameContext &frameContext = context_.frameContexts.alloc(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.alloc(frame,
+								     context_.activeState);
 
 	for (auto const &algo : algorithms())
 		algo->queueRequest(context_, frame, frameContext, controls);
@@ -274,7 +275,8 @@ void IPASoftSimple::queueRequest(const uint32_t frame, const ControlList &contro
 
 void IPASoftSimple::fillParamsBuffer(const uint32_t frame)
 {
-	IPAFrameContext &frameContext = context_.frameContexts.get(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.get(frame,
+								   context_.activeState);
 	for (auto const &algo : algorithms())
 		algo->prepare(context_, frame, frameContext, params_);
 	setIspParams.emit();
@@ -284,7 +286,8 @@ void IPASoftSimple::processStats(const uint32_t frame,
 				 [[maybe_unused]] const uint32_t bufferId,
 				 const ControlList &sensorControls)
 {
-	IPAFrameContext &frameContext = context_.frameContexts.get(frame);
+	IPAFrameContext &frameContext = context_.frameContexts.get(frame,
+								   context_.activeState);
 
 	frameContext.sensor.exposure =
 		sensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();