@@ -327,7 +327,7 @@ void IpaBase::start(const ControlList &controls, StartResult *result)
unsigned int agcConvergenceFrames = 0, awbConvergenceFrames = 0;
frameCount_ = 0;
if (firstStart_) {
- dropFrameCount_ = helper_->hideFramesStartup();
+ startupCount_ = helper_->hideFramesStartup();
mistrustCount_ = helper_->mistrustFramesStartup();
/*
@@ -353,14 +353,14 @@ void IpaBase::start(const ControlList &controls, StartResult *result)
awbConvergenceFrames += mistrustCount_;
}
} else {
- dropFrameCount_ = helper_->hideFramesModeSwitch();
+ startupCount_ = helper_->hideFramesModeSwitch();
mistrustCount_ = helper_->mistrustFramesModeSwitch();
}
result->startupFrameCount = std::max({ agcConvergenceFrames, awbConvergenceFrames });
- result->invalidFrameCount = dropFrameCount_;
+ result->invalidFrameCount = startupCount_;
- dropFrameCount_ = std::max({ dropFrameCount_, agcConvergenceFrames, awbConvergenceFrames });
+ startupCount_ = std::max({ startupCount_, agcConvergenceFrames, awbConvergenceFrames });
LOG(IPARPI, Debug) << "Startup frames: " << result->startupFrameCount
<< " Invalid frames: " << result->invalidFrameCount;
@@ -443,7 +443,7 @@ void IpaBase::prepareIsp(const PrepareParams ¶ms)
/* Allow a 10% margin on the comparison below. */
Duration delta = (frameTimestamp - lastRunTimestamp_) * 1.0ns;
- if (lastRunTimestamp_ && frameCount_ > dropFrameCount_ &&
+ if (lastRunTimestamp_ && frameCount_ > startupCount_ &&
delta < controllerMinFrameDuration * 0.9 && !hdrChange) {
/*
* Ensure we merge the previous frame's metadata with the current
@@ -115,8 +115,8 @@ private:
/* How many frames we should avoid running control algos on. */
unsigned int mistrustCount_;
- /* Number of frames that need to be dropped on startup. */
- unsigned int dropFrameCount_;
+ /* Number of frames that need to be marked as dropped on startup. */
+ unsigned int startupCount_;
/* Frame timestamp for the last run of the controller. */
uint64_t lastRunTimestamp_;
Rename dropFrameCount_ to startupCount_ to better reflect its use as frames are no longer dropped by the pipeline handler. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> --- src/ipa/rpi/common/ipa_base.cpp | 10 +++++----- src/ipa/rpi/common/ipa_base.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)