[libcamera-devel] [PATCH 08/17] DNI: ipa: raspberrypi: Code refactoring to match style guidelines

Laurent Pinchart laurent.pinchart at ideasonboard.com
Wed Jul 27 04:11:33 CEST 2022


Hi Naush,

Thank you for the patch.

On Tue, Jul 26, 2022 at 01:45:40PM +0100, Naushir Patuck wrote:
> Refactor the source files src/ipa/raspberrypi/controller/rps/[b|c|d]* to match the
> recommended formatting guidelines for the libcamera project. The vast majority
> of changes in this commit comprise of switching from snake_case to CamelCase,
> and starting class member functions with a lower case character.
> 
> Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  .../controller/black_level_status.h           |   6 +-
>  src/ipa/raspberrypi/controller/rpi/agc.cpp    |   2 +-
>  .../controller/rpi/black_level.cpp            |  34 ++---
>  .../controller/rpi/black_level.hpp            |  12 +-
>  src/ipa/raspberrypi/controller/rpi/ccm.cpp    |  84 +++++++------
>  src/ipa/raspberrypi/controller/rpi/ccm.hpp    |  12 +-
>  .../raspberrypi/controller/rpi/contrast.cpp   | 118 +++++++++---------
>  .../raspberrypi/controller/rpi/contrast.hpp   |  30 ++---
>  src/ipa/raspberrypi/controller/rpi/dpc.cpp    |  18 +--
>  src/ipa/raspberrypi/controller/rpi/dpc.hpp    |   6 +-
>  10 files changed, 160 insertions(+), 162 deletions(-)

[snip]

> diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp
> index 6b3497f13c19..101b5ea92cf5 100644
> --- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp
> +++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp
> @@ -26,38 +26,38 @@ BlackLevel::BlackLevel(Controller *controller)
>  {
>  }
>  
> -char const *BlackLevel::Name() const
> +char const *BlackLevel::name() const
>  {
>  	return NAME;
>  }
>  
> -void BlackLevel::Read(boost::property_tree::ptree const &params)
> +void BlackLevel::read(boost::property_tree::ptree const &params)
>  {
> -	uint16_t black_level = params.get<uint16_t>(
> +	uint16_t blackLevel = params.get<uint16_t>(
>  		"black_level", 4096); // 64 in 10 bits scaled to 16 bits
> -	black_level_r_ = params.get<uint16_t>("black_level_r", black_level);
> -	black_level_g_ = params.get<uint16_t>("black_level_g", black_level);
> -	black_level_b_ = params.get<uint16_t>("black_level_b", black_level);
> +	blackLevelR_ = params.get<uint16_t>("blackLevelR", blackLevel);
> +	blackLevelG_ = params.get<uint16_t>("blackLevelG", blackLevel);
> +	blackLevelB_ = params.get<uint16_t>("blackLevelB", blackLevel);

The JSON strings should stay in snake_case.

>  	LOG(RPiBlackLevel, Debug)
> -		<< " Read black levels red " << black_level_r_
> -		<< " green " << black_level_g_
> -		<< " blue " << black_level_b_;
> +		<< " Read black levels red " << blackLevelR_
> +		<< " green " << blackLevelG_
> +		<< " blue " << blackLevelB_;
>  }
>  
> -void BlackLevel::Prepare(Metadata *image_metadata)
> +void BlackLevel::prepare(Metadata *imageMetadata)
>  {
> -	// Possibly we should think about doing this in a switch_mode or
> +	// Possibly we should think about doing this in a switchMode or
>  	// something?
>  	struct BlackLevelStatus status;
> -	status.black_level_r = black_level_r_;
> -	status.black_level_g = black_level_g_;
> -	status.black_level_b = black_level_b_;
> -	image_metadata->Set("black_level.status", status);
> +	status.blackLevelR = blackLevelR_;
> +	status.blackLevelG = blackLevelG_;
> +	status.blackLevelB = blackLevelB_;
> +	imageMetadata->set("black_level.status", status);
>  }
>  
>  // Register algorithm with the system.
> -static Algorithm *Create(Controller *controller)
> +static Algorithm *create(Controller *controller)
>  {
>  	return new BlackLevel(controller);
>  }
> -static RegisterAlgorithm reg(NAME, &Create);
> +static RegisterAlgorithm reg(NAME, &create);

[snip]

-- 
Regards,

Laurent Pinchart


More information about the libcamera-devel mailing list