| Message ID | 20201116164918.2055-11-david.plowman@raspberrypi.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi David, On Mon, 16 Nov 2020 at 16:49, David Plowman <david.plowman@raspberrypi.com> wrote: > Previously we required that the sensor absolutely reaches the target > exposure, but this can fail if frame rates or analogue gains are > limited. Instead insist only that we get several frames with the same > exposure time, analogue gain and that the algorithm's target exposure > hasn't changed either. > > Signed-off-by: David Plowman <david.plowman@raspberrypi.com> > --- > src/ipa/raspberrypi/controller/rpi/agc.cpp | 65 +++++++++++++--------- > src/ipa/raspberrypi/controller/rpi/agc.hpp | 3 + > 2 files changed, 42 insertions(+), 26 deletions(-) > > diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp > b/src/ipa/raspberrypi/controller/rpi/agc.cpp > index 93b46a28..7be74763 100644 > --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp > +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp > @@ -164,6 +164,8 @@ Agc::Agc(Controller *controller) > flicker_period_ = 0.0; > fixed_shutter_ = 0; > fixed_analogue_gain_ = 0.0; > + memset(&last_device_status_, 0, sizeof(last_device_status_)); > + last_target_exposure_ = 0.0; > Set last_target_exposure_ in the initialiser list? > } > > char const *Agc::Name() const > @@ -264,8 +266,6 @@ void Agc::SwitchMode([[maybe_unused]] CameraMode const > &camera_mode, > > void Agc::Prepare(Metadata *image_metadata) > { > - int lock_count = lock_count_; > - lock_count_ = 0; > status_.digital_gain = 1.0; > fetchAwbStatus(image_metadata); // always fetch it so that Process > knows it's been done > > @@ -289,32 +289,10 @@ void Agc::Prepare(Metadata *image_metadata) > LOG(RPiAgc, Debug) << "Use digital_gain " > << status_.digital_gain; > LOG(RPiAgc, Debug) << "Effective exposure > " << actual_exposure * status_.digital_gain; > // Decide whether AEC/AGC has converged. > - // Insist AGC is steady for MAX_LOCK_COUNT > - // frames before we say we are "locked". > - // (The hard-coded constants may need to > - // become customisable.) > - if (status_.target_exposure_value) { > -#define MAX_LOCK_COUNT 3 > - double err = 0.10 * > status_.target_exposure_value + 200; > - if (actual_exposure < > - > status_.target_exposure_value + err && > - actual_exposure > > - > status_.target_exposure_value - err) > - lock_count_ = > - > std::min(lock_count + 1, > - > MAX_LOCK_COUNT); > - else if (actual_exposure < > - > status_.target_exposure_value + 1.5 * err && > - actual_exposure > > - > status_.target_exposure_value - 1.5 * err) > - lock_count_ = lock_count; > - LOG(RPiAgc, Debug) << "Lock count: > " << lock_count_; > - } > + updateLockStatus(device_status); > } > } else > - LOG(RPiAgc, Debug) << Name() << ": no device > metadata"; > - status_.locked = lock_count_ >= MAX_LOCK_COUNT; > - //printf("%s\n", status_.locked ? "+++++++++" : "-"); > + LOG(RPiAgc, Warning) << Name() << ": no device > metadata"; > image_metadata->Set("agc.status", status_); > } > } > @@ -345,6 +323,41 @@ void Agc::Process(StatisticsPtr &stats, Metadata > *image_metadata) > writeAndFinish(image_metadata, desaturate); > } > > +void Agc::updateLockStatus(DeviceStatus const &device_status) > +{ > + const double ERROR_FACTOR = 0.10; // make these customisable? > + const int MAX_LOCK_COUNT = 5; > + > + // Add 200us to the exposure time error to allow for line > quantisation. > + double exposure_error = last_device_status_.shutter_speed * > ERROR_FACTOR + 200; > + double gain_error = last_device_status_.analogue_gain * > ERROR_FACTOR; > + double target_error = last_target_exposure_ * ERROR_FACTOR; > + > + // Note that we don't know the exposure/gain limits of the sensor, > so > + // the values we keep requesting may be unachievable. For this > reason > + // we only insist that we're close to values in the past few > frames. > + if (device_status.shutter_speed > > last_device_status_.shutter_speed - exposure_error && > + device_status.shutter_speed < > last_device_status_.shutter_speed + exposure_error && > + device_status.analogue_gain > > last_device_status_.analogue_gain - gain_error && > + device_status.analogue_gain < > last_device_status_.analogue_gain + gain_error && > + status_.target_exposure_value > last_target_exposure_ - > target_error && > + status_.target_exposure_value < last_target_exposure_ + > target_error) > + lock_count_ = std::min(lock_count_ + 1, MAX_LOCK_COUNT); > + else if (device_status.shutter_speed < > last_device_status_.shutter_speed - 1.5 * exposure_error || > + device_status.shutter_speed > > last_device_status_.shutter_speed + 1.5 * exposure_error || > + device_status.analogue_gain < > last_device_status_.analogue_gain - 1.5 * gain_error || > + device_status.analogue_gain > > last_device_status_.analogue_gain + 1.5 * gain_error || > + status_.target_exposure_value < last_target_exposure_ - > 1.5 * target_error || > + status_.target_exposure_value > last_target_exposure_ + > 1.5 * target_error) > + lock_count_ = 0; > Does the 1.5 factor need to be a const? > + > + last_device_status_ = device_status; > + last_target_exposure_ = status_.target_exposure_value; > + > + LOG(RPiAgc, Debug) << "Lock count updated to " << lock_count_; > + status_.locked = lock_count_ >= MAX_LOCK_COUNT; > Only need a == here :) > +} > + > static void copy_string(std::string const &s, char *d, size_t size) > { > size_t length = s.copy(d, size - 1); > diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp > b/src/ipa/raspberrypi/controller/rpi/agc.hpp > index 859a9650..47ebb324 100644 > --- a/src/ipa/raspberrypi/controller/rpi/agc.hpp > +++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp > @@ -82,6 +82,7 @@ public: > void Process(StatisticsPtr &stats, Metadata *image_metadata) > override; > > private: > + void updateLockStatus(DeviceStatus const &device_status); > AgcConfig config_; > void housekeepConfig(); > void fetchCurrentExposure(Metadata *image_metadata); > @@ -111,6 +112,8 @@ private: > ExposureValues filtered_; // these values are filtered towards > target > AgcStatus status_; > int lock_count_; > + DeviceStatus last_device_status_; > + double last_target_exposure_; > // Below here the "settings" that applications can change. > std::string metering_mode_name_; > std::string exposure_mode_name_; > -- > 2.20.1 > Apart from the minor nits: Reviewed-by: Naushir Patuck <naush@raspberrypi.com> > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel >
Hi Naush Thanks for the feedback on all those patches. I'll try and push an updated version out on Friday with those fixes, plus any other comments that arrive! David On Tue, 17 Nov 2020 at 11:06, Naushir Patuck <naush@raspberrypi.com> wrote: > > Hi David, > > On Mon, 16 Nov 2020 at 16:49, David Plowman <david.plowman@raspberrypi.com> wrote: >> >> Previously we required that the sensor absolutely reaches the target >> exposure, but this can fail if frame rates or analogue gains are >> limited. Instead insist only that we get several frames with the same >> exposure time, analogue gain and that the algorithm's target exposure >> hasn't changed either. >> >> Signed-off-by: David Plowman <david.plowman@raspberrypi.com> >> --- >> src/ipa/raspberrypi/controller/rpi/agc.cpp | 65 +++++++++++++--------- >> src/ipa/raspberrypi/controller/rpi/agc.hpp | 3 + >> 2 files changed, 42 insertions(+), 26 deletions(-) >> >> diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp >> index 93b46a28..7be74763 100644 >> --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp >> +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp >> @@ -164,6 +164,8 @@ Agc::Agc(Controller *controller) >> flicker_period_ = 0.0; >> fixed_shutter_ = 0; >> fixed_analogue_gain_ = 0.0; >> + memset(&last_device_status_, 0, sizeof(last_device_status_)); >> + last_target_exposure_ = 0.0; > > > Set last_target_exposure_ in the initialiser list? > >> >> } >> >> char const *Agc::Name() const >> @@ -264,8 +266,6 @@ void Agc::SwitchMode([[maybe_unused]] CameraMode const &camera_mode, >> >> void Agc::Prepare(Metadata *image_metadata) >> { >> - int lock_count = lock_count_; >> - lock_count_ = 0; >> status_.digital_gain = 1.0; >> fetchAwbStatus(image_metadata); // always fetch it so that Process knows it's been done >> >> @@ -289,32 +289,10 @@ void Agc::Prepare(Metadata *image_metadata) >> LOG(RPiAgc, Debug) << "Use digital_gain " << status_.digital_gain; >> LOG(RPiAgc, Debug) << "Effective exposure " << actual_exposure * status_.digital_gain; >> // Decide whether AEC/AGC has converged. >> - // Insist AGC is steady for MAX_LOCK_COUNT >> - // frames before we say we are "locked". >> - // (The hard-coded constants may need to >> - // become customisable.) >> - if (status_.target_exposure_value) { >> -#define MAX_LOCK_COUNT 3 >> - double err = 0.10 * status_.target_exposure_value + 200; >> - if (actual_exposure < >> - status_.target_exposure_value + err && >> - actual_exposure > >> - status_.target_exposure_value - err) >> - lock_count_ = >> - std::min(lock_count + 1, >> - MAX_LOCK_COUNT); >> - else if (actual_exposure < >> - status_.target_exposure_value + 1.5 * err && >> - actual_exposure > >> - status_.target_exposure_value - 1.5 * err) >> - lock_count_ = lock_count; >> - LOG(RPiAgc, Debug) << "Lock count: " << lock_count_; >> - } >> + updateLockStatus(device_status); >> } >> } else >> - LOG(RPiAgc, Debug) << Name() << ": no device metadata"; >> - status_.locked = lock_count_ >= MAX_LOCK_COUNT; >> - //printf("%s\n", status_.locked ? "+++++++++" : "-"); >> + LOG(RPiAgc, Warning) << Name() << ": no device metadata"; >> image_metadata->Set("agc.status", status_); >> } >> } >> @@ -345,6 +323,41 @@ void Agc::Process(StatisticsPtr &stats, Metadata *image_metadata) >> writeAndFinish(image_metadata, desaturate); >> } >> >> +void Agc::updateLockStatus(DeviceStatus const &device_status) >> +{ >> + const double ERROR_FACTOR = 0.10; // make these customisable? >> + const int MAX_LOCK_COUNT = 5; >> + >> + // Add 200us to the exposure time error to allow for line quantisation. >> + double exposure_error = last_device_status_.shutter_speed * ERROR_FACTOR + 200; >> + double gain_error = last_device_status_.analogue_gain * ERROR_FACTOR; >> + double target_error = last_target_exposure_ * ERROR_FACTOR; >> + >> + // Note that we don't know the exposure/gain limits of the sensor, so >> + // the values we keep requesting may be unachievable. For this reason >> + // we only insist that we're close to values in the past few frames. >> + if (device_status.shutter_speed > last_device_status_.shutter_speed - exposure_error && >> + device_status.shutter_speed < last_device_status_.shutter_speed + exposure_error && >> + device_status.analogue_gain > last_device_status_.analogue_gain - gain_error && >> + device_status.analogue_gain < last_device_status_.analogue_gain + gain_error && >> + status_.target_exposure_value > last_target_exposure_ - target_error && >> + status_.target_exposure_value < last_target_exposure_ + target_error) >> + lock_count_ = std::min(lock_count_ + 1, MAX_LOCK_COUNT); >> + else if (device_status.shutter_speed < last_device_status_.shutter_speed - 1.5 * exposure_error || >> + device_status.shutter_speed > last_device_status_.shutter_speed + 1.5 * exposure_error || >> + device_status.analogue_gain < last_device_status_.analogue_gain - 1.5 * gain_error || >> + device_status.analogue_gain > last_device_status_.analogue_gain + 1.5 * gain_error || >> + status_.target_exposure_value < last_target_exposure_ - 1.5 * target_error || >> + status_.target_exposure_value > last_target_exposure_ + 1.5 * target_error) >> + lock_count_ = 0; > > > Does the 1.5 factor need to be a const? > >> >> + >> + last_device_status_ = device_status; >> + last_target_exposure_ = status_.target_exposure_value; >> + >> + LOG(RPiAgc, Debug) << "Lock count updated to " << lock_count_; >> + status_.locked = lock_count_ >= MAX_LOCK_COUNT; > > > Only need a == here :) > >> >> +} >> + >> static void copy_string(std::string const &s, char *d, size_t size) >> { >> size_t length = s.copy(d, size - 1); >> diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp >> index 859a9650..47ebb324 100644 >> --- a/src/ipa/raspberrypi/controller/rpi/agc.hpp >> +++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp >> @@ -82,6 +82,7 @@ public: >> void Process(StatisticsPtr &stats, Metadata *image_metadata) override; >> >> private: >> + void updateLockStatus(DeviceStatus const &device_status); >> AgcConfig config_; >> void housekeepConfig(); >> void fetchCurrentExposure(Metadata *image_metadata); >> @@ -111,6 +112,8 @@ private: >> ExposureValues filtered_; // these values are filtered towards target >> AgcStatus status_; >> int lock_count_; >> + DeviceStatus last_device_status_; >> + double last_target_exposure_; >> // Below here the "settings" that applications can change. >> std::string metering_mode_name_; >> std::string exposure_mode_name_; >> -- >> 2.20.1 > > > Apart from the minor nits: > > Reviewed-by: Naushir Patuck <naush@raspberrypi.com> > >> >> >> _______________________________________________ >> libcamera-devel mailing list >> libcamera-devel@lists.libcamera.org >> https://lists.libcamera.org/listinfo/libcamera-devel
diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp index 93b46a28..7be74763 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp @@ -164,6 +164,8 @@ Agc::Agc(Controller *controller) flicker_period_ = 0.0; fixed_shutter_ = 0; fixed_analogue_gain_ = 0.0; + memset(&last_device_status_, 0, sizeof(last_device_status_)); + last_target_exposure_ = 0.0; } char const *Agc::Name() const @@ -264,8 +266,6 @@ void Agc::SwitchMode([[maybe_unused]] CameraMode const &camera_mode, void Agc::Prepare(Metadata *image_metadata) { - int lock_count = lock_count_; - lock_count_ = 0; status_.digital_gain = 1.0; fetchAwbStatus(image_metadata); // always fetch it so that Process knows it's been done @@ -289,32 +289,10 @@ void Agc::Prepare(Metadata *image_metadata) LOG(RPiAgc, Debug) << "Use digital_gain " << status_.digital_gain; LOG(RPiAgc, Debug) << "Effective exposure " << actual_exposure * status_.digital_gain; // Decide whether AEC/AGC has converged. - // Insist AGC is steady for MAX_LOCK_COUNT - // frames before we say we are "locked". - // (The hard-coded constants may need to - // become customisable.) - if (status_.target_exposure_value) { -#define MAX_LOCK_COUNT 3 - double err = 0.10 * status_.target_exposure_value + 200; - if (actual_exposure < - status_.target_exposure_value + err && - actual_exposure > - status_.target_exposure_value - err) - lock_count_ = - std::min(lock_count + 1, - MAX_LOCK_COUNT); - else if (actual_exposure < - status_.target_exposure_value + 1.5 * err && - actual_exposure > - status_.target_exposure_value - 1.5 * err) - lock_count_ = lock_count; - LOG(RPiAgc, Debug) << "Lock count: " << lock_count_; - } + updateLockStatus(device_status); } } else - LOG(RPiAgc, Debug) << Name() << ": no device metadata"; - status_.locked = lock_count_ >= MAX_LOCK_COUNT; - //printf("%s\n", status_.locked ? "+++++++++" : "-"); + LOG(RPiAgc, Warning) << Name() << ": no device metadata"; image_metadata->Set("agc.status", status_); } } @@ -345,6 +323,41 @@ void Agc::Process(StatisticsPtr &stats, Metadata *image_metadata) writeAndFinish(image_metadata, desaturate); } +void Agc::updateLockStatus(DeviceStatus const &device_status) +{ + const double ERROR_FACTOR = 0.10; // make these customisable? + const int MAX_LOCK_COUNT = 5; + + // Add 200us to the exposure time error to allow for line quantisation. + double exposure_error = last_device_status_.shutter_speed * ERROR_FACTOR + 200; + double gain_error = last_device_status_.analogue_gain * ERROR_FACTOR; + double target_error = last_target_exposure_ * ERROR_FACTOR; + + // Note that we don't know the exposure/gain limits of the sensor, so + // the values we keep requesting may be unachievable. For this reason + // we only insist that we're close to values in the past few frames. + if (device_status.shutter_speed > last_device_status_.shutter_speed - exposure_error && + device_status.shutter_speed < last_device_status_.shutter_speed + exposure_error && + device_status.analogue_gain > last_device_status_.analogue_gain - gain_error && + device_status.analogue_gain < last_device_status_.analogue_gain + gain_error && + status_.target_exposure_value > last_target_exposure_ - target_error && + status_.target_exposure_value < last_target_exposure_ + target_error) + lock_count_ = std::min(lock_count_ + 1, MAX_LOCK_COUNT); + else if (device_status.shutter_speed < last_device_status_.shutter_speed - 1.5 * exposure_error || + device_status.shutter_speed > last_device_status_.shutter_speed + 1.5 * exposure_error || + device_status.analogue_gain < last_device_status_.analogue_gain - 1.5 * gain_error || + device_status.analogue_gain > last_device_status_.analogue_gain + 1.5 * gain_error || + status_.target_exposure_value < last_target_exposure_ - 1.5 * target_error || + status_.target_exposure_value > last_target_exposure_ + 1.5 * target_error) + lock_count_ = 0; + + last_device_status_ = device_status; + last_target_exposure_ = status_.target_exposure_value; + + LOG(RPiAgc, Debug) << "Lock count updated to " << lock_count_; + status_.locked = lock_count_ >= MAX_LOCK_COUNT; +} + static void copy_string(std::string const &s, char *d, size_t size) { size_t length = s.copy(d, size - 1); diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp index 859a9650..47ebb324 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.hpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp @@ -82,6 +82,7 @@ public: void Process(StatisticsPtr &stats, Metadata *image_metadata) override; private: + void updateLockStatus(DeviceStatus const &device_status); AgcConfig config_; void housekeepConfig(); void fetchCurrentExposure(Metadata *image_metadata); @@ -111,6 +112,8 @@ private: ExposureValues filtered_; // these values are filtered towards target AgcStatus status_; int lock_count_; + DeviceStatus last_device_status_; + double last_target_exposure_; // Below here the "settings" that applications can change. std::string metering_mode_name_; std::string exposure_mode_name_;
Previously we required that the sensor absolutely reaches the target exposure, but this can fail if frame rates or analogue gains are limited. Instead insist only that we get several frames with the same exposure time, analogue gain and that the algorithm's target exposure hasn't changed either. Signed-off-by: David Plowman <david.plowman@raspberrypi.com> --- src/ipa/raspberrypi/controller/rpi/agc.cpp | 65 +++++++++++++--------- src/ipa/raspberrypi/controller/rpi/agc.hpp | 3 + 2 files changed, 42 insertions(+), 26 deletions(-)