| Message ID | 20260114113016.25162-9-mzamazal@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
2026. 01. 14. 12:30 keltezéssel, Milan Zamazal írta: > Let's move the contrast settings from lut.cpp to adjust.cpp, where they > belong, similarly to saturation. > > Signed-off-by: Milan Zamazal <mzamazal@redhat.com> > --- > src/ipa/simple/algorithms/adjust.cpp | 14 +++++++++++ > src/ipa/simple/algorithms/lut.cpp | 35 +--------------------------- > src/ipa/simple/algorithms/lut.h | 11 --------- > 3 files changed, 15 insertions(+), 45 deletions(-) > > diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp > index 8ce0631e4..27ae2a53a 100644 > --- a/src/ipa/simple/algorithms/adjust.cpp > +++ b/src/ipa/simple/algorithms/adjust.cpp > [...] > @@ -95,6 +105,10 @@ void Adjust::process([[maybe_unused]] IPAContext &context, > [[maybe_unused]] const SwIspStats *stats, > ControlList &metadata) > { > + const auto &contrast = frameContext.contrast; > + if (contrast) > + metadata.set(controls::Contrast, contrast.value()); > + > const auto &saturation = frameContext.saturation; > metadata.set(controls::Saturation, saturation.value_or(1.0)); Is the difference between when these two are reported intentional? > } > [...]
Hi Barnabás, Barnabás Pőcze <barnabas.pocze@ideasonboard.com> writes: > 2026. 01. 14. 12:30 keltezéssel, Milan Zamazal írta: >> Let's move the contrast settings from lut.cpp to adjust.cpp, where they >> belong, similarly to saturation. >> Signed-off-by: Milan Zamazal <mzamazal@redhat.com> >> --- >> src/ipa/simple/algorithms/adjust.cpp | 14 +++++++++++ >> src/ipa/simple/algorithms/lut.cpp | 35 +--------------------------- >> src/ipa/simple/algorithms/lut.h | 11 --------- >> 3 files changed, 15 insertions(+), 45 deletions(-) >> diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp >> index 8ce0631e4..27ae2a53a 100644 >> --- a/src/ipa/simple/algorithms/adjust.cpp >> +++ b/src/ipa/simple/algorithms/adjust.cpp >> [...] >> @@ -95,6 +105,10 @@ void Adjust::process([[maybe_unused]] IPAContext &context, >> [[maybe_unused]] const SwIspStats *stats, >> ControlList &metadata) >> { >> + const auto &contrast = frameContext.contrast; >> + if (contrast) >> + metadata.set(controls::Contrast, contrast.value()); >> + >> const auto &saturation = frameContext.saturation; >> metadata.set(controls::Saturation, saturation.value_or(1.0)); > > Is the difference between when these two are reported intentional? Historic. I think contrast metadata should be set unconditionally. Since I consider patches that move and modify code at the same time difficult to (re)view, I'd prefer fixing that in a separate patch. >> } >> [...]
2026. 01. 14. 12:30 keltezéssel, Milan Zamazal írta: > Let's move the contrast settings from lut.cpp to adjust.cpp, where they > belong, similarly to saturation. > > Signed-off-by: Milan Zamazal <mzamazal@redhat.com> > --- Looks ok to me. Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> > src/ipa/simple/algorithms/adjust.cpp | 14 +++++++++++ > src/ipa/simple/algorithms/lut.cpp | 35 +--------------------------- > src/ipa/simple/algorithms/lut.h | 11 --------- > 3 files changed, 15 insertions(+), 45 deletions(-) > > diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp > index 8ce0631e4..27ae2a53a 100644 > --- a/src/ipa/simple/algorithms/adjust.cpp > +++ b/src/ipa/simple/algorithms/adjust.cpp > @@ -23,6 +23,7 @@ LOG_DEFINE_CATEGORY(IPASoftAdjust) > > int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningData) > { > + context.ctrlMap[&controls::Contrast] = ControlInfo(0.0f, 2.0f, 1.0f); > if (context.ccmEnabled) > context.ctrlMap[&controls::Saturation] = ControlInfo(0.0f, 2.0f, 1.0f); > return 0; > @@ -31,6 +32,7 @@ int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningD > int Adjust::configure(IPAContext &context, > [[maybe_unused]] const IPAConfigInfo &configInfo) > { > + context.activeState.knobs.contrast = std::optional<double>(); > context.activeState.knobs.saturation = std::optional<double>(); > > return 0; > @@ -41,6 +43,12 @@ void Adjust::queueRequest(typename Module::Context &context, > [[maybe_unused]] typename Module::FrameContext &frameContext, > const ControlList &controls) > { > + const auto &contrast = controls.get(controls::Contrast); > + if (contrast.has_value()) { > + context.activeState.knobs.contrast = contrast; > + LOG(IPASoftAdjust, Debug) << "Setting contrast to " << contrast.value(); > + } > + > const auto &saturation = controls.get(controls::Saturation); > if (saturation.has_value()) { > context.activeState.knobs.saturation = saturation; > @@ -75,6 +83,8 @@ void Adjust::prepare(IPAContext &context, > IPAFrameContext &frameContext, > [[maybe_unused]] DebayerParams *params) > { > + frameContext.contrast = context.activeState.knobs.contrast; > + > if (!context.ccmEnabled) > return; > > @@ -95,6 +105,10 @@ void Adjust::process([[maybe_unused]] IPAContext &context, > [[maybe_unused]] const SwIspStats *stats, > ControlList &metadata) > { > + const auto &contrast = frameContext.contrast; > + if (contrast) > + metadata.set(controls::Contrast, contrast.value()); > + > const auto &saturation = frameContext.saturation; > metadata.set(controls::Saturation, saturation.value_or(1.0)); > } > diff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp > index 141ea17fa..3a00bf4ee 100644 > --- a/src/ipa/simple/algorithms/lut.cpp > +++ b/src/ipa/simple/algorithms/lut.cpp > @@ -24,36 +24,16 @@ LOG_DEFINE_CATEGORY(IPASoftLut) > > namespace ipa::soft::algorithms { > > -int Lut::init(IPAContext &context, > - [[maybe_unused]] const YamlObject &tuningData) > -{ > - context.ctrlMap[&controls::Contrast] = ControlInfo(0.0f, 2.0f, 1.0f); > - return 0; > -} > - > int Lut::configure(IPAContext &context, > [[maybe_unused]] const IPAConfigInfo &configInfo) > { > /* Gamma value is fixed */ > context.configuration.gamma = 1.0 / 2.2; > - context.activeState.knobs.contrast = std::optional<double>(); > updateGammaTable(context); > > return 0; > } > > -void Lut::queueRequest(typename Module::Context &context, > - [[maybe_unused]] const uint32_t frame, > - [[maybe_unused]] typename Module::FrameContext &frameContext, > - const ControlList &controls) > -{ > - const auto &contrast = controls.get(controls::Contrast); > - if (contrast.has_value()) { > - context.activeState.knobs.contrast = contrast; > - LOG(IPASoftLut, Debug) << "Setting contrast to " << contrast.value(); > - } > -} > - > void Lut::updateGammaTable(IPAContext &context) > { > const auto blackLevel = context.activeState.blc.level; > @@ -96,11 +76,9 @@ int16_t Lut::matrixValue(unsigned int i, float ccm) const > > void Lut::prepare(IPAContext &context, > [[maybe_unused]] const uint32_t frame, > - IPAFrameContext &frameContext, > + [[maybe_unused]] IPAFrameContext &frameContext, > DebayerParams *params) > { > - frameContext.contrast = context.activeState.knobs.contrast; > - > /* > * Update the gamma table if needed. This means if black level changes > * and since the black level gets updated only if a lower value is > @@ -157,17 +135,6 @@ void Lut::prepare(IPAContext &context, > params->contrastExp = context.activeState.gamma.contrastExp; > } > > -void Lut::process([[maybe_unused]] IPAContext &context, > - [[maybe_unused]] const uint32_t frame, > - [[maybe_unused]] IPAFrameContext &frameContext, > - [[maybe_unused]] const SwIspStats *stats, > - ControlList &metadata) > -{ > - const auto &contrast = frameContext.contrast; > - if (contrast) > - metadata.set(controls::Contrast, contrast.value()); > -} > - > REGISTER_IPA_ALGORITHM(Lut, "Lut") > > } /* namespace ipa::soft::algorithms */ > diff --git a/src/ipa/simple/algorithms/lut.h b/src/ipa/simple/algorithms/lut.h > index 0eafd0695..ad16d1e8e 100644 > --- a/src/ipa/simple/algorithms/lut.h > +++ b/src/ipa/simple/algorithms/lut.h > @@ -19,22 +19,11 @@ public: > Lut() = default; > ~Lut() = default; > > - int init(IPAContext &context, const YamlObject &tuningData) override; > int configure(IPAContext &context, const IPAConfigInfo &configInfo) override; > - void queueRequest(typename Module::Context &context, > - const uint32_t frame, > - typename Module::FrameContext &frameContext, > - const ControlList &controls) > - override; > void prepare(IPAContext &context, > const uint32_t frame, > IPAFrameContext &frameContext, > DebayerParams *params) override; > - void process(IPAContext &context, > - const uint32_t frame, > - IPAFrameContext &frameContext, > - const SwIspStats *stats, > - ControlList &metadata) override; > > private: > void updateGammaTable(IPAContext &context);
diff --git a/src/ipa/simple/algorithms/adjust.cpp b/src/ipa/simple/algorithms/adjust.cpp index 8ce0631e4..27ae2a53a 100644 --- a/src/ipa/simple/algorithms/adjust.cpp +++ b/src/ipa/simple/algorithms/adjust.cpp @@ -23,6 +23,7 @@ LOG_DEFINE_CATEGORY(IPASoftAdjust) int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningData) { + context.ctrlMap[&controls::Contrast] = ControlInfo(0.0f, 2.0f, 1.0f); if (context.ccmEnabled) context.ctrlMap[&controls::Saturation] = ControlInfo(0.0f, 2.0f, 1.0f); return 0; @@ -31,6 +32,7 @@ int Adjust::init(IPAContext &context, [[maybe_unused]] const YamlObject &tuningD int Adjust::configure(IPAContext &context, [[maybe_unused]] const IPAConfigInfo &configInfo) { + context.activeState.knobs.contrast = std::optional<double>(); context.activeState.knobs.saturation = std::optional<double>(); return 0; @@ -41,6 +43,12 @@ void Adjust::queueRequest(typename Module::Context &context, [[maybe_unused]] typename Module::FrameContext &frameContext, const ControlList &controls) { + const auto &contrast = controls.get(controls::Contrast); + if (contrast.has_value()) { + context.activeState.knobs.contrast = contrast; + LOG(IPASoftAdjust, Debug) << "Setting contrast to " << contrast.value(); + } + const auto &saturation = controls.get(controls::Saturation); if (saturation.has_value()) { context.activeState.knobs.saturation = saturation; @@ -75,6 +83,8 @@ void Adjust::prepare(IPAContext &context, IPAFrameContext &frameContext, [[maybe_unused]] DebayerParams *params) { + frameContext.contrast = context.activeState.knobs.contrast; + if (!context.ccmEnabled) return; @@ -95,6 +105,10 @@ void Adjust::process([[maybe_unused]] IPAContext &context, [[maybe_unused]] const SwIspStats *stats, ControlList &metadata) { + const auto &contrast = frameContext.contrast; + if (contrast) + metadata.set(controls::Contrast, contrast.value()); + const auto &saturation = frameContext.saturation; metadata.set(controls::Saturation, saturation.value_or(1.0)); } diff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp index 141ea17fa..3a00bf4ee 100644 --- a/src/ipa/simple/algorithms/lut.cpp +++ b/src/ipa/simple/algorithms/lut.cpp @@ -24,36 +24,16 @@ LOG_DEFINE_CATEGORY(IPASoftLut) namespace ipa::soft::algorithms { -int Lut::init(IPAContext &context, - [[maybe_unused]] const YamlObject &tuningData) -{ - context.ctrlMap[&controls::Contrast] = ControlInfo(0.0f, 2.0f, 1.0f); - return 0; -} - int Lut::configure(IPAContext &context, [[maybe_unused]] const IPAConfigInfo &configInfo) { /* Gamma value is fixed */ context.configuration.gamma = 1.0 / 2.2; - context.activeState.knobs.contrast = std::optional<double>(); updateGammaTable(context); return 0; } -void Lut::queueRequest(typename Module::Context &context, - [[maybe_unused]] const uint32_t frame, - [[maybe_unused]] typename Module::FrameContext &frameContext, - const ControlList &controls) -{ - const auto &contrast = controls.get(controls::Contrast); - if (contrast.has_value()) { - context.activeState.knobs.contrast = contrast; - LOG(IPASoftLut, Debug) << "Setting contrast to " << contrast.value(); - } -} - void Lut::updateGammaTable(IPAContext &context) { const auto blackLevel = context.activeState.blc.level; @@ -96,11 +76,9 @@ int16_t Lut::matrixValue(unsigned int i, float ccm) const void Lut::prepare(IPAContext &context, [[maybe_unused]] const uint32_t frame, - IPAFrameContext &frameContext, + [[maybe_unused]] IPAFrameContext &frameContext, DebayerParams *params) { - frameContext.contrast = context.activeState.knobs.contrast; - /* * Update the gamma table if needed. This means if black level changes * and since the black level gets updated only if a lower value is @@ -157,17 +135,6 @@ void Lut::prepare(IPAContext &context, params->contrastExp = context.activeState.gamma.contrastExp; } -void Lut::process([[maybe_unused]] IPAContext &context, - [[maybe_unused]] const uint32_t frame, - [[maybe_unused]] IPAFrameContext &frameContext, - [[maybe_unused]] const SwIspStats *stats, - ControlList &metadata) -{ - const auto &contrast = frameContext.contrast; - if (contrast) - metadata.set(controls::Contrast, contrast.value()); -} - REGISTER_IPA_ALGORITHM(Lut, "Lut") } /* namespace ipa::soft::algorithms */ diff --git a/src/ipa/simple/algorithms/lut.h b/src/ipa/simple/algorithms/lut.h index 0eafd0695..ad16d1e8e 100644 --- a/src/ipa/simple/algorithms/lut.h +++ b/src/ipa/simple/algorithms/lut.h @@ -19,22 +19,11 @@ public: Lut() = default; ~Lut() = default; - int init(IPAContext &context, const YamlObject &tuningData) override; int configure(IPAContext &context, const IPAConfigInfo &configInfo) override; - void queueRequest(typename Module::Context &context, - const uint32_t frame, - typename Module::FrameContext &frameContext, - const ControlList &controls) - override; void prepare(IPAContext &context, const uint32_t frame, IPAFrameContext &frameContext, DebayerParams *params) override; - void process(IPAContext &context, - const uint32_t frame, - IPAFrameContext &frameContext, - const SwIspStats *stats, - ControlList &metadata) override; private: void updateGammaTable(IPAContext &context);
Let's move the contrast settings from lut.cpp to adjust.cpp, where they belong, similarly to saturation. Signed-off-by: Milan Zamazal <mzamazal@redhat.com> --- src/ipa/simple/algorithms/adjust.cpp | 14 +++++++++++ src/ipa/simple/algorithms/lut.cpp | 35 +--------------------------- src/ipa/simple/algorithms/lut.h | 11 --------- 3 files changed, 15 insertions(+), 45 deletions(-)