@@ -39,6 +39,7 @@ namespace {
constexpr float kDefaultBrightness = 0.0f;
constexpr float kDefaultContrast = 1.0f;
+constexpr float kDefaultHue = 0.0f;
constexpr float kDefaultSaturation = 1.0f;
class BrightnessQ : public Quantizer<int8_t>
@@ -59,6 +60,27 @@ public:
}
};
+class HueQ : public Quantizer<int8_t>
+{
+public:
+ HueQ(float val) { set(val); }
+ HueQ(int8_t val) { set(val); }
+
+ static constexpr float MaxDegrees = 90;
+ static constexpr float q = 128.0f / MaxDegrees;
+
+ int8_t fromFloat(float v) const override
+ {
+ int quantized = std::lround(v * q);
+ return static_cast<int8_t>(std::clamp<int>(quantized, -128, 127));
+ }
+
+ float toFloat(int8_t v) const override
+ {
+ return static_cast<float>(v) / q;
+ }
+};
+
class ContrastSaturationQuantizer : public Quantizer<uint8_t>
{
public:
@@ -92,6 +114,7 @@ int ColorProcessing::init(IPAContext &context,
cmap[&controls::Brightness] = ControlInfo(-1.0f, 0.993f, kDefaultBrightness);
cmap[&controls::Contrast] = ControlInfo(0.0f, 1.993f, kDefaultContrast);
+ cmap[&controls::Hue] = ControlInfo(-90.0f, 90.0f, kDefaultHue);
cmap[&controls::Saturation] = ControlInfo(0.0f, 1.993f, kDefaultSaturation);
return 0;
@@ -107,6 +130,7 @@ int ColorProcessing::configure(IPAContext &context,
cproc.brightness = BrightnessQ(kDefaultBrightness);
cproc.contrast = ContrastQ(kDefaultContrast);
+ cproc.hue = HueQ(kDefaultHue);
cproc.saturation = SaturationQ(kDefaultSaturation);
return 0;
@@ -148,6 +172,17 @@ void ColorProcessing::queueRequest(IPAContext &context,
LOG(RkISP1CProc, Debug) << "Set contrast to " << value.value();
}
+ const auto &hue = controls.get(controls::Hue);
+ if (hue) {
+ HueQ value = *hue;
+ if (cproc.hue != value) {
+ cproc.hue = value;
+ update = true;
+ }
+
+ LOG(RkISP1CProc, Debug) << "Set hue to " << value.value();
+ }
+
const auto saturation = controls.get(controls::Saturation);
if (saturation) {
SaturationQ value = *saturation;
@@ -161,6 +196,7 @@ void ColorProcessing::queueRequest(IPAContext &context,
frameContext.cproc.brightness = cproc.brightness;
frameContext.cproc.contrast = cproc.contrast;
+ frameContext.cproc.hue = cproc.hue;
frameContext.cproc.saturation = cproc.saturation;
frameContext.cproc.update = update;
}
@@ -181,6 +217,7 @@ void ColorProcessing::prepare([[maybe_unused]] IPAContext &context,
config.setEnabled(true);
config->brightness = frameContext.cproc.brightness.quantized();
config->contrast = frameContext.cproc.contrast.quantized();
+ config->hue = frameContext.cproc.hue.quantized();
config->sat = frameContext.cproc.saturation.quantized();
}
@@ -193,6 +230,7 @@ void ColorProcessing::process([[maybe_unused]] IPAContext &context, [[maybe_unus
{
metadata.set(controls::Brightness, frameContext.cproc.brightness.value());
metadata.set(controls::Contrast, frameContext.cproc.contrast.value());
+ metadata.set(controls::Hue, frameContext.cproc.hue.value());
metadata.set(controls::Saturation, frameContext.cproc.saturation.value());
}
@@ -118,6 +118,7 @@ struct IPAActiveState {
struct {
Quantized<int8_t> brightness;
Quantized<uint8_t> contrast;
+ Quantized<int8_t> hue;
Quantized<uint8_t> saturation;
} cproc;
@@ -172,6 +173,7 @@ struct IPAFrameContext : public FrameContext {
struct {
Quantized<int8_t> brightness;
Quantized<uint8_t> contrast;
+ Quantized<int8_t> hue;
Quantized<uint8_t> saturation;
bool update;
} cproc;
The RKISP1 supports a configurable Hue as part of the colour processing unit (cproc). This is implemented as a phase shift of the chrominance values between -90 and +87.188 degrees. Implement the new control converting to the hardware scale accordingly and report the applied control in the completed request metadata. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> --- src/ipa/rkisp1/algorithms/cproc.cpp | 38 +++++++++++++++++++++++++++++ src/ipa/rkisp1/ipa_context.h | 2 ++ 2 files changed, 40 insertions(+)