@@ -111,7 +111,7 @@ void Agc::prepare(IPAContext &context, [[maybe_unused]] const uint32_t frame,
IPAFrameContext &frameContext,
[[maybe_unused]] ipu3_uapi_params *params)
{
- agc_.prepare(context.activeState.agc, frameContext.agc);
+ agc_.prepare(context.configuration.agc, context.activeState.agc, frameContext.agc);
}
Histogram Agc::parseStatistics(const ipu3_uapi_stats_3a *stats,
@@ -650,6 +650,7 @@ void AgcAlgorithm::queueRequest(const agc::Session &session, agc::ActiveState &s
/**
* \brief Prepare a frame
+ * \param[in] session The agc session configuration
* \param[in] state The agc active state
* \param[in] frameContext The agc frame context
*
@@ -663,7 +664,8 @@ void AgcAlgorithm::queueRequest(const agc::Session &session, agc::ActiveState &s
*
* \sa Algorithm::prepare()
*/
-void AgcAlgorithm::prepare(agc::ActiveState &state, agc::FrameContext &frameContext)
+void AgcAlgorithm::prepare([[maybe_unused]] const agc::Session &session, agc::ActiveState &state,
+ agc::FrameContext &frameContext)
{
uint32_t activeAutoExposure = state.automatic.exposure;
double activeAutoGain = state.automatic.gain;
@@ -146,7 +146,8 @@ public:
void queueRequest(const agc::Session &session, agc::ActiveState &state,
agc::FrameContext &frameContext, const ControlList &controls);
- void prepare(agc::ActiveState &state, agc::FrameContext &frameContext);
+ void prepare(const agc::Session &session, agc::ActiveState &state,
+ agc::FrameContext &frameContext);
void process(const agc::Session &session, agc::ActiveState &state,
agc::FrameContext &frameContext, std::optional<ProcessParams> &¶ms,
@@ -207,7 +207,7 @@ void Agc::fillWeightsArrayBuffer(MaliC55Params *params, const enum MaliC55Blocks
void Agc::prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext, MaliC55Params *params)
{
- agc_.prepare(context.activeState.agc, frameContext.agc);
+ agc_.prepare(context.configuration.agc, context.activeState.agc, frameContext.agc);
if (frame > 0)
return;
@@ -209,7 +209,7 @@ void Agc::queueRequest(IPAContext &context,
void Agc::prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext, RkISP1Params *params)
{
- agc_.prepare(context.activeState.agc, frameContext.agc);
+ agc_.prepare(context.configuration.agc, context.activeState.agc, frameContext.agc);
if (context.configuration.compress.supported) {
frameContext.compress.enable = true;
@@ -74,7 +74,7 @@ void Agc::queueRequest(IPAContext &context, [[maybe_unused]] const uint32_t fram
void Agc::prepare(IPAContext &context, [[maybe_unused]] const uint32_t frame,
IPAFrameContext &frameContext, [[maybe_unused]] DebayerParams *params)
{
- agc_.prepare(context.activeState.agc, frameContext.agc);
+ agc_.prepare(context.configuration.agc, context.activeState.agc, frameContext.agc);
}
void Agc::process(IPAContext &context,
In an upcoming change the prepare() function needs to access the session. Prepare for that by passing the session into AgcAlgorithm::prepare() without using it. Update the IPA implementations accordingly. Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> --- src/ipa/ipu3/algorithms/agc.cpp | 2 +- src/ipa/libipa/agc.cpp | 4 +++- src/ipa/libipa/agc.h | 3 ++- src/ipa/mali-c55/algorithms/agc.cpp | 2 +- src/ipa/rkisp1/algorithms/agc.cpp | 2 +- src/ipa/softisp/algorithms/agc.cpp | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-)