Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-23 08:35:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipa: rkisp1: agc: Rename maxShutterSpeed to maxFrameDuration

Browse source 
The AGC active state and frame context both contain a variable named
maxShutterSpeed. The variable is used to limit the maximum shutter speed
when computing the exposure time and gains, but stores the maximum frame
duration, not clamped by the sensor's maximum shutter speed. Rename it
to maxFrameDuration.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2024-06-16 19:06:01 +03:00
parent b53c6de03f
commit 14056bceb5
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ipa/rkisp1/algorithms/agc.cpp
View file

@ -182,7 +182,7 @@ int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo)
* except it's computed in the IPA and not here so we'd have to * except it's computed in the IPA and not here so we'd have to
* recompute it. * recompute it.
*/ */
context.activeState.agc.maxShutterSpeed = context.configuration.sensor.maxShutterSpeed; context.activeState.agc.maxFrameDuration = context.configuration.sensor.maxShutterSpeed;
/* /*
* Define the measurement window for AGC as a centered rectangle * Define the measurement window for AGC as a centered rectangle
@ -269,11 +269,11 @@ void Agc::queueRequest(IPAContext &context,
const auto &frameDurationLimits = controls.get(controls::FrameDurationLimits); const auto &frameDurationLimits = controls.get(controls::FrameDurationLimits);
if (frameDurationLimits) { if (frameDurationLimits) {
utils::Duration maxShutterSpeed = utils::Duration maxFrameDuration =
std::chrono::milliseconds((*frameDurationLimits).back()); std::chrono::milliseconds((*frameDurationLimits).back());
agc.maxShutterSpeed = maxShutterSpeed; agc.maxFrameDuration = maxFrameDuration;
} }
frameContext.agc.maxShutterSpeed = agc.maxShutterSpeed; frameContext.agc.maxFrameDuration = agc.maxFrameDuration;
} }
/** /**
@ -421,7 +421,7 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
expMeans_ = { params->ae.exp_mean, context.hw->numAeCells }; expMeans_ = { params->ae.exp_mean, context.hw->numAeCells };
utils::Duration maxShutterSpeed = std::min(context.configuration.sensor.maxShutterSpeed, utils::Duration maxShutterSpeed = std::min(context.configuration.sensor.maxShutterSpeed,
frameContext.agc.maxShutterSpeed); frameContext.agc.maxFrameDuration);
setLimits(context.configuration.sensor.minShutterSpeed, setLimits(context.configuration.sensor.minShutterSpeed,
maxShutterSpeed, maxShutterSpeed,
context.configuration.sensor.minAnalogueGain, context.configuration.sensor.minAnalogueGain,

4
src/ipa/rkisp1/ipa_context.cpp
View file

@ -172,7 +172,7 @@ namespace libcamera::ipa::rkisp1 {
* \var IPAActiveState::agc.meteringMode * \var IPAActiveState::agc.meteringMode
* \brief Metering mode as set by the AeMeteringMode control * \brief Metering mode as set by the AeMeteringMode control
* *
* \var IPAActiveState::agc.maxShutterSpeed * \var IPAActiveState::agc.maxFrameDuration
* \brief Maximum frame duration as set by the FrameDurationLimits control * \brief Maximum frame duration as set by the FrameDurationLimits control
*/ */
@ -314,7 +314,7 @@ namespace libcamera::ipa::rkisp1 {
* \var IPAFrameContext::agc.meteringMode * \var IPAFrameContext::agc.meteringMode
* \brief Metering mode as set by the AeMeteringMode control * \brief Metering mode as set by the AeMeteringMode control
* *
* \var IPAFrameContext::agc.maxShutterSpeed * \var IPAFrameContext::agc.maxFrameDuration
* \brief Maximum frame duration as set by the FrameDurationLimits control * \brief Maximum frame duration as set by the FrameDurationLimits control
* *
* \var IPAFrameContext::agc.update * \var IPAFrameContext::agc.update

4
src/ipa/rkisp1/ipa_context.h
View file

@ -73,7 +73,7 @@ struct IPAActiveState {
controls::AeConstraintModeEnum constraintMode; controls::AeConstraintModeEnum constraintMode;
controls::AeExposureModeEnum exposureMode; controls::AeExposureModeEnum exposureMode;
controls::AeMeteringModeEnum meteringMode; controls::AeMeteringModeEnum meteringMode;
utils::Duration maxShutterSpeed; utils::Duration maxFrameDuration;
} agc; } agc;
struct { struct {
@ -122,7 +122,7 @@ struct IPAFrameContext : public FrameContext {
controls::AeConstraintModeEnum constraintMode; controls::AeConstraintModeEnum constraintMode;
controls::AeExposureModeEnum exposureMode; controls::AeExposureModeEnum exposureMode;
controls::AeMeteringModeEnum meteringMode; controls::AeMeteringModeEnum meteringMode;
utils::Duration maxShutterSpeed; utils::Duration maxFrameDuration;
bool update; bool update;
} agc; } agc;