[PATCH 02/12] ipa: libipa: agc_mean_luminance: Fix enumerator names

Paul Elder paul.elder at ideasonboard.com
Mon Jun 17 12:10:38 CEST 2024


On Sun, Jun 16, 2024 at 07:39:00PM +0300, Laurent Pinchart wrote:
> Enumerators in libcamera start with an upper case letter. Fix the
> AgcConstraint::Bound enumerators.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Reviewed-by: Paul Elder <paul.elder at ideasonboard.com>

> ---
>  src/ipa/libipa/agc_mean_luminance.cpp | 10 +++++-----
>  src/ipa/libipa/agc_mean_luminance.h   |  4 ++--
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/src/ipa/libipa/agc_mean_luminance.cpp b/src/ipa/libipa/agc_mean_luminance.cpp
> index 271b5ae4bc97..f97ef11771c4 100644
> --- a/src/ipa/libipa/agc_mean_luminance.cpp
> +++ b/src/ipa/libipa/agc_mean_luminance.cpp
> @@ -59,9 +59,9 @@ static constexpr double kDefaultRelativeLuminanceTarget = 0.16;
>  /**
>   * \enum AgcMeanLuminance::AgcConstraint::Bound
>   * \brief Specify whether the constraint defines a lower or upper bound
> - * \var AgcMeanLuminance::AgcConstraint::lower
> + * \var AgcMeanLuminance::AgcConstraint::Lower
>   * \brief The constraint defines a lower bound
> - * \var AgcMeanLuminance::AgcConstraint::upper
> + * \var AgcMeanLuminance::AgcConstraint::Upper
>   * \brief The constraint defines an upper bound
>   */
>  
> @@ -209,7 +209,7 @@ int AgcMeanLuminance::parseConstraintModes(const YamlObject &tuningData)
>  	 */
>  	if (constraintModes_.empty()) {
>  		AgcConstraint constraint = {
> -			AgcConstraint::Bound::lower,
> +			AgcConstraint::Bound::Lower,
>  			0.98,
>  			1.0,
>  			0.5
> @@ -467,11 +467,11 @@ double AgcMeanLuminance::constraintClampGain(uint32_t constraintModeIndex,
>  		double newGain = constraint.yTarget * hist.bins() /
>  				 hist.interQuantileMean(constraint.qLo, constraint.qHi);
>  
> -		if (constraint.bound == AgcConstraint::Bound::lower &&
> +		if (constraint.bound == AgcConstraint::Bound::Lower &&
>  		    newGain > gain)
>  			gain = newGain;
>  
> -		if (constraint.bound == AgcConstraint::Bound::upper &&
> +		if (constraint.bound == AgcConstraint::Bound::Upper &&
>  		    newGain < gain)
>  			gain = newGain;
>  	}
> diff --git a/src/ipa/libipa/agc_mean_luminance.h b/src/ipa/libipa/agc_mean_luminance.h
> index 0a81c6d285b8..d1bddda5d162 100644
> --- a/src/ipa/libipa/agc_mean_luminance.h
> +++ b/src/ipa/libipa/agc_mean_luminance.h
> @@ -31,8 +31,8 @@ public:
>  
>  	struct AgcConstraint {
>  		enum class Bound {
> -			lower = 0,
> -			upper = 1
> +			Lower = 0,
> +			Upper = 1
>  		};
>  		Bound bound;
>  		double qLo;


More information about the libcamera-devel mailing list