diff options
| author | Jacopo Mondi <jacopo.mondi@ideasonboard.com> | 2024-10-16 17:20:43 +0200 |
|---|---|---|
| committer | Jacopo Mondi <jacopo.mondi@ideasonboard.com> | 2024-10-30 15:48:18 +0100 |
| commit | 6e1ec7ac7c0653b6445b23bfef6e52353cc0bc9e (patch) | |
| tree | 5c4a9011c65069e06fc5fe69004395cd5edab878 | |
| parent | 93aa0ba55d6eaa0164fbe1d6c82fa245d3b2e5b1 (diff) | |
ipa: rkisp1: Initialize FrameContext.agc.meteringMode
The RkISP1 AGC algorithms assumes the metering mode to be
"MeteringMatrix" and pre-fill an array of weights associated
with it stored in meteringModes_[MeteringMatrix] when intializing
the algorithm in parseMeteringModes().
It laters fetches the weights when computing parameters using the
FrameContext.agc.meteringMode as index of the meteringModes_ array.
When a Request gets queued to the algorithm, the
FrameContext.agc.meteringMode index is populated from the algorithm's
active state, and optionally updated if the application has specified
a different metering mode.
In case of Request underrun however, a non-initialized FrameContext
gets provided to the algorithm, causing an (unhandled) exception when
accessing the meteringModes_ array.
Fix this by intializing the AGC metering mode to a supported value
coming from the ActiveState in IPAFrameContext::init().
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
| -rw-r--r-- | src/ipa/rkisp1/algorithms/agc.cpp | 2 | ||||
| -rw-r--r-- | src/ipa/rkisp1/ipa_context.cpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp index 301b7ec2..db62b905 100644 --- a/src/ipa/rkisp1/algorithms/agc.cpp +++ b/src/ipa/rkisp1/algorithms/agc.cpp @@ -175,6 +175,8 @@ int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo) static_cast<controls::AeConstraintModeEnum>(constraintModes().begin()->first); context.activeState.agc.exposureMode = static_cast<controls::AeExposureModeEnum>(exposureModeHelpers().begin()->first); + + /* Use the metering matrix mode by default. */ context.activeState.agc.meteringMode = static_cast<controls::AeMeteringModeEnum>(meteringModes_.begin()->first); diff --git a/src/ipa/rkisp1/ipa_context.cpp b/src/ipa/rkisp1/ipa_context.cpp index 2dad42b3..e8860913 100644 --- a/src/ipa/rkisp1/ipa_context.cpp +++ b/src/ipa/rkisp1/ipa_context.cpp @@ -421,6 +421,11 @@ void IPAFrameContext::init(const uint32_t frameNum, const ActiveState &activeState) { FrameContext::init(frameNum, activeState); + + const IPAActiveState *rkisp1ActiveState = + reinterpret_cast<const IPAActiveState *>(&activeState); + + agc.meteringMode = rkisp1ActiveState->agc.meteringMode; } /** |