summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ipa/rkisp1/algorithms/awb.cpp75
-rw-r--r--src/ipa/rkisp1/algorithms/awb.h4
2 files changed, 52 insertions, 27 deletions
diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp
index f6449565..68931927 100644
--- a/src/ipa/rkisp1/algorithms/awb.cpp
+++ b/src/ipa/rkisp1/algorithms/awb.cpp
@@ -16,6 +16,7 @@
#include <libcamera/ipa/core_ipa_interface.h>
+#include "libipa/awb_grey.h"
#include "libipa/colours.h"
/**
@@ -40,6 +41,30 @@ constexpr int32_t kDefaultColourTemperature = 5000;
/* Minimum mean value below which AWB can't operate. */
constexpr double kMeanMinThreshold = 2.0;
+class RkISP1AwbStats : public AwbStats
+{
+public:
+ RkISP1AwbStats(const RGB<double> &rgbMeans)
+ : rgbMeans_(rgbMeans)
+ {
+ }
+
+ double computeColourError([[maybe_unused]] const RGB<double> &gains) const override
+ {
+ LOG(RkISP1Awb, Error)
+ << "RkISP1AwbStats::computeColourError is not implemented";
+ return 0.0;
+ }
+
+ RGB<double> getRGBMeans() const override
+ {
+ return rgbMeans_;
+ }
+
+private:
+ RGB<double> rgbMeans_;
+};
+
Awb::Awb()
: rgbMode_(false)
{
@@ -55,15 +80,12 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)
kMaxColourTemperature,
kDefaultColourTemperature);
- Interpolator<Vector<double, 2>> gainCurve;
- int ret = gainCurve.readYaml(tuningData["colourGains"], "ct", "gains");
- if (ret < 0)
- LOG(RkISP1Awb, Warning)
- << "Failed to parse 'colourGains' "
- << "parameter from tuning file; "
- << "manual colour temperature will not work properly";
- else
- colourGainCurve_ = gainCurve;
+ awbAlgo_ = std::make_unique<AwbGrey>();
+ int ret = awbAlgo_->init(tuningData);
+ if (ret) {
+ LOG(RkISP1Awb, Error) << "Failed to init awb algorithm";
+ return ret;
+ }
return 0;
}
@@ -128,10 +150,10 @@ void Awb::queueRequest(IPAContext &context,
* This will be fixed with the bayes AWB algorithm.
*/
update = true;
- } else if (colourTemperature && colourGainCurve_) {
- const auto &gains = colourGainCurve_->getInterpolated(*colourTemperature);
- awb.gains.manual.r() = gains[0];
- awb.gains.manual.b() = gains[1];
+ } else if (colourTemperature) {
+ const auto &gains = awbAlgo_->gainsFromColourTemperature(*colourTemperature);
+ awb.gains.manual.r() = gains.r();
+ awb.gains.manual.b() = gains.b();
awb.temperatureK = *colourTemperature;
update = true;
}
@@ -251,33 +273,34 @@ void Awb::process(IPAContext &context,
rgbMeans.b() < kMeanMinThreshold)
return;
- activeState.awb.temperatureK = estimateCCT(rgbMeans);
+ /*
+ * \Todo: Hardcode lux to a fixed value, until an estimation is
+ * implemented.
+ */
+ int lux = 1000;
+
+ RkISP1AwbStats awbStats{ rgbMeans };
+ AwbResult awbResult = awbAlgo_->calculateAwb(awbStats, lux);
+
+ activeState.awb.temperatureK = awbResult.colourTemperature;
/* Metadata shall contain the up to date measurement */
metadata.set(controls::ColourTemperature, activeState.awb.temperatureK);
/*
- * Estimate the red and blue gains to apply in a grey world. The green
- * gain is hardcoded to 1.0. Avoid divisions by zero by clamping the
- * divisor to a minimum value of 1.0.
- */
- RGB<double> gains({ rgbMeans.g() / std::max(rgbMeans.r(), 1.0),
- 1.0,
- rgbMeans.g() / std::max(rgbMeans.b(), 1.0) });
-
- /*
* Clamp the gain values to the hardware, which expresses gains as Q2.8
* unsigned integer values. Set the minimum just above zero to avoid
* divisions by zero when computing the raw means in subsequent
* iterations.
*/
- gains = gains.max(1.0 / 256).min(1023.0 / 256);
+ awbResult.gains = awbResult.gains.max(1.0 / 256).min(1023.0 / 256);
/* Filter the values to avoid oscillations. */
double speed = 0.2;
- gains = gains * speed + activeState.awb.gains.automatic * (1 - speed);
+ awbResult.gains = awbResult.gains * speed +
+ activeState.awb.gains.automatic * (1 - speed);
- activeState.awb.gains.automatic = gains;
+ activeState.awb.gains.automatic = awbResult.gains;
LOG(RkISP1Awb, Debug)
<< std::showpoint
diff --git a/src/ipa/rkisp1/algorithms/awb.h b/src/ipa/rkisp1/algorithms/awb.h
index 35248769..7e6c3862 100644
--- a/src/ipa/rkisp1/algorithms/awb.h
+++ b/src/ipa/rkisp1/algorithms/awb.h
@@ -11,6 +11,7 @@
#include "libcamera/internal/vector.h"
+#include "libipa/awb.h"
#include "libipa/interpolator.h"
#include "algorithm.h"
@@ -42,7 +43,8 @@ private:
RGB<double> calculateRgbMeans(const IPAFrameContext &frameContext,
const rkisp1_cif_isp_awb_stat *awb) const;
- std::optional<Interpolator<Vector<double, 2>>> colourGainCurve_;
+ std::unique_ptr<AwbAlgorithm> awbAlgo_;
+
bool rgbMode_;
};
generated by cgit v1.2.1 (git 2.18.0) at 2025-05-24 10:41:24 +0000
="hl kwb">double y = it->second.get_value<double>(); points_.push_back(Point(x, y)); } assert(points_.size() >= 2); } void Pwl::Append(double x, double y, const double eps) { if (points_.empty() || points_.back().x + eps < x) points_.push_back(Point(x, y)); } void Pwl::Prepend(double x, double y, const double eps) { if (points_.empty() || points_.front().x - eps > x) points_.insert(points_.begin(), Point(x, y)); } Pwl::Interval Pwl::Domain() const { return Interval(points_[0].x, points_[points_.size() - 1].x); } Pwl::Interval Pwl::Range() const { double lo = points_[0].y, hi = lo; for (auto &p : points_) lo = std::min(lo, p.y), hi = std::max(hi, p.y); return Interval(lo, hi); } bool Pwl::Empty() const { return points_.empty(); } double Pwl::Eval(double x, int *span_ptr, bool update_span) const { int span = findSpan(x, span_ptr && *span_ptr != -1 ? *span_ptr : points_.size() / 2 - 1); if (span_ptr && update_span) *span_ptr = span; return points_[span].y + (x - points_[span].x) * (points_[span + 1].y - points_[span].y) / (points_[span + 1].x - points_[span].x); } int Pwl::findSpan(double x, int span) const { // Pwls are generally small, so linear search may well be faster than // binary, though could review this if large PWls start turning up. int last_span = points_.size() - 2; // some algorithms may call us with span pointing directly at the last // control point span = std::max(0, std::min(last_span, span)); while (span < last_span && x >= points_[span + 1].x) span++; while (span && x < points_[span].x) span--; return span; } Pwl::PerpType Pwl::Invert(Point const &xy, Point &perp, int &span, const double eps) const { assert(span >= -1); bool prev_off_end = false; for (span = span + 1; span < (int)points_.size() - 1; span++) { Point span_vec = points_[span + 1] - points_[span]; double t = ((xy - points_[span]) % span_vec) / span_vec.Len2(); if (t < -eps) // off the start of this span { if (span == 0) { perp = points_[span]; return PerpType::Start; } else if (prev_off_end) { perp = points_[span]; return PerpType::Vertex; } } else if (t > 1 + eps) // off the end of this span { if (span == (int)points_.size() - 2) { perp = points_[span + 1]; return PerpType::End; } prev_off_end = true; } else // a true perpendicular { perp = points_[span] + span_vec * t; return PerpType::Perpendicular; } } return PerpType::None; } Pwl Pwl::Inverse(bool *true_inverse, const double eps) const { bool appended = false, prepended = false, neither = false; Pwl inverse; for (Point const &p : points_) { if (inverse.Empty()) inverse.Append(p.y, p.x, eps); else if (std::abs(inverse.points_.back().x - p.y) <= eps || std::abs(inverse.points_.front().x - p.y) <= eps) /* do nothing */; else if (p.y > inverse.points_.back().x) { inverse.Append(p.y, p.x, eps); appended = true; } else if (p.y < inverse.points_.front().x) { inverse.Prepend(p.y, p.x, eps); prepended = true; } else neither = true; } // This is not a proper inverse if we found ourselves putting points // onto both ends of the inverse, or if there were points that couldn't // go on either. if (true_inverse) *true_inverse = !(neither || (appended && prepended)); return inverse; } Pwl Pwl::Compose(Pwl const &other, const double eps) const { double this_x = points_[0].x, this_y = points_[0].y; int this_span = 0, other_span = other.findSpan(this_y, 0); Pwl result({ { this_x, other.Eval(this_y, &other_span, false) } }); while (this_span != (int)points_.size() - 1) { double dx = points_[this_span + 1].x - points_[this_span].x, dy = points_[this_span + 1].y - points_[this_span].y; if (abs(dy) > eps && other_span + 1 < (int)other.points_.size() && points_[this_span + 1].y >= other.points_[other_span + 1].x + eps) { // next control point in result will be where this // function's y reaches the next span in other this_x = points_[this_span].x + (other.points_[other_span + 1].x - points_[this_span].y) * dx / dy; this_y = other.points_[++other_span].x; } else if (abs(dy) > eps && other_span > 0 && points_[this_span + 1].y <= other.points_[other_span - 1].x - eps) { // next control point in result will be where this // function's y reaches the previous span in other this_x = points_[this_span].x + (other.points_[other_span + 1].x - points_[this_span].y) * dx / dy; this_y = other.points_[--other_span].x; } else { // we stay in the same span in other this_span++; this_x = points_[this_span].x, this_y = points_[this_span].y; } result.Append(this_x, other.Eval(this_y, &other_span, false), eps); } return result; } void Pwl::Map(std::function<void(double x, double y)> f) const { for (auto &pt : points_) f(pt.x, pt.y); } void Pwl::Map2(Pwl const &pwl0, Pwl const &pwl1, std::function<void(double x, double y0, double y1)> f) { int span0 = 0, span1 = 0; double x = std::min(pwl0.points_[0].x, pwl1.points_[0].x); f(x, pwl0.Eval(x, &span0, false), pwl1.Eval(x, &span1, false)); while (span0 < (int)pwl0.points_.size() - 1 || span1 < (int)pwl1.points_.size() - 1) { if (span0 == (int)pwl0.points_.size() - 1) x = pwl1.points_[++span1].x; else if (span1 == (int)pwl1.points_.size() - 1) x = pwl0.points_[++span0].x; else if (pwl0.points_[span0 + 1].x > pwl1.points_[span1 + 1].x) x = pwl1.points_[++span1].x; else x = pwl0.points_[++span0].x; f(x, pwl0.Eval(x, &span0, false), pwl1.Eval(x, &span1, false)); } } Pwl Pwl::Combine(Pwl const &pwl0, Pwl const &pwl1, std::function<double(double x, double y0, double y1)> f, const double eps) { Pwl result; Map2(pwl0, pwl1, [&](double x, double y0, double y1) { result.Append(x, f(x, y0, y1), eps); }); return result; } void Pwl::MatchDomain(Interval const &domain, bool clip, const double eps) { int span = 0; Prepend(domain.start, Eval(clip ? points_[0].x : domain.start, &span), eps); span = points_.size() - 2; Append(domain.end, Eval(clip ? points_.back().x : domain.end, &span), eps); } Pwl &Pwl::operator*=(double d) { for (auto &pt : points_) pt.y *= d; return *this; } void Pwl::Debug(FILE *fp) const { fprintf(fp, "Pwl {\n"); for (auto &p : points_) fprintf(fp, "\t(%g, %g)\n", p.x, p.y); fprintf(fp, "}\n"); }
generated by cgit v1.2.1 (git 2.18.0) at 2025-05-24 10:41:24 +0000