diff options
Diffstat (limited to 'src/ipa/rpi')
| -rw-r--r-- | src/ipa/rpi/common/ipa_base.cpp | 11 | ||||
| -rw-r--r-- | src/ipa/rpi/controller/rpi/awb.cpp | 1 | ||||
| -rw-r--r-- | src/ipa/rpi/controller/rpi/awb.h | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp index 6734c32e..e0a93daa 100644 --- a/src/ipa/rpi/common/ipa_base.cpp +++ b/src/ipa/rpi/common/ipa_base.cpp @@ -946,6 +946,17 @@ void IpaBase::applyControls(const ControlList &controls) break; } + case controls::AE_ENABLE: { + /* + * The AeEnable control is now just a wrapper that will already have been + * converted to ExposureTimeMode and AnalogueGainMode equivalents, so there + * would be nothing to do here. Nonetheless, "handle" the control so as to + * avoid warnings from the "default:" clause of the switch statement. + */ + + break; + } + case controls::AE_FLICKER_MODE: { RPiController::AgcAlgorithm *agc = dynamic_cast<RPiController::AgcAlgorithm *>( controller_.getAlgorithm("agc")); diff --git a/src/ipa/rpi/controller/rpi/awb.cpp b/src/ipa/rpi/controller/rpi/awb.cpp index 8479ae40..365b595f 100644 --- a/src/ipa/rpi/controller/rpi/awb.cpp +++ b/src/ipa/rpi/controller/rpi/awb.cpp @@ -165,7 +165,6 @@ int AwbConfig::read(const libcamera::YamlObject ¶ms) bayes = false; } } - fast = params[fast].get<int>(bayes); /* default to fast for Bayesian, otherwise slow */ whitepointR = params["whitepoint_r"].get<double>(0.0); whitepointB = params["whitepoint_b"].get<double>(0.0); if (bayes == false) diff --git a/src/ipa/rpi/controller/rpi/awb.h b/src/ipa/rpi/controller/rpi/awb.h index 86640f8f..2fb91254 100644 --- a/src/ipa/rpi/controller/rpi/awb.h +++ b/src/ipa/rpi/controller/rpi/awb.h @@ -43,7 +43,6 @@ struct AwbConfig { uint16_t startupFrames; unsigned int convergenceFrames; /* approx number of frames to converge */ double speed; /* IIR filter speed applied to algorithm results */ - bool fast; /* "fast" mode uses a 16x16 rather than 32x32 grid */ libcamera::ipa::Pwl ctR; /* function maps CT to r (= R/G) */ libcamera::ipa::Pwl ctB; /* function maps CT to b (= B/G) */ libcamera::ipa::Pwl ctRInverse; /* inverse of ctR */ |