[RFC,1/7] ipa: mali-c55: blc: mark offset member variables
diff mbox series

Message ID 20251011160335.50578-2-kieran.bingham@ideasonboard.com
State New
Headers show
Series
  • Preparatory cleanup for libipa rework.
Related show

Commit Message

Kieran Bingham Oct. 11, 2025, 4:03 p.m. UTC 
Rename the offset variables to use a suffixed '_' to make
it clear these variables are stored in the class.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/ipa/mali-c55/algorithms/blc.cpp | 42 ++++++++++++++---------------
 src/ipa/mali-c55/algorithms/blc.h   |  8 +++---
 2 files changed, 25 insertions(+), 25 deletions(-)

Comments

Jacopo Mondi Oct. 23, 2025, 4:46 p.m. UTC | #1 
Hi Kieran

On Sat, Oct 11, 2025 at 05:03:29PM +0100, Kieran Bingham wrote:
> Rename the offset variables to use a suffixed '_' to make
> it clear these variables are stored in the class.
>
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

Thanks
  j

> ---
>  src/ipa/mali-c55/algorithms/blc.cpp | 42 ++++++++++++++---------------
>  src/ipa/mali-c55/algorithms/blc.h   |  8 +++---
>  2 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/src/ipa/mali-c55/algorithms/blc.cpp b/src/ipa/mali-c55/algorithms/blc.cpp
> index 2a54c86a91f8..85642c0435a2 100644
> --- a/src/ipa/mali-c55/algorithms/blc.cpp
> +++ b/src/ipa/mali-c55/algorithms/blc.cpp
> @@ -38,13 +38,13 @@ BlackLevelCorrection::BlackLevelCorrection()
>  int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,
>  			       const YamlObject &tuningData)
>  {
> -	offset00 = tuningData["offset00"].get<uint32_t>(0);
> -	offset01 = tuningData["offset01"].get<uint32_t>(0);
> -	offset10 = tuningData["offset10"].get<uint32_t>(0);
> -	offset11 = tuningData["offset11"].get<uint32_t>(0);
> +	offset00_ = tuningData["offset00"].get<uint32_t>(0);
> +	offset01_ = tuningData["offset01"].get<uint32_t>(0);
> +	offset10_ = tuningData["offset10"].get<uint32_t>(0);
> +	offset11_ = tuningData["offset11"].get<uint32_t>(0);
>
> -	if (offset00 > kMaxOffset || offset01 > kMaxOffset ||
> -	    offset10 > kMaxOffset || offset11 > kMaxOffset) {
> +	if (offset00_ > kMaxOffset || offset01_ > kMaxOffset ||
> +	    offset10_ > kMaxOffset || offset11_ > kMaxOffset) {
>  		LOG(MaliC55Blc, Error) << "Invalid black level offsets";
>  		return -EINVAL;
>  	}
> @@ -52,8 +52,8 @@ int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,
>  	tuningParameters_ = true;
>
>  	LOG(MaliC55Blc, Debug)
> -		<< "Black levels: 00 " << offset00 << ", 01 " << offset01
> -		<< ", 10 " << offset10 << ", 11 " << offset11;
> +		<< "Black levels: 00 " << offset00_ << ", 01 " << offset01_
> +		<< ", 10 " << offset10_ << ", 11 " << offset11_;
>
>  	return 0;
>  }
> @@ -69,11 +69,11 @@ int BlackLevelCorrection::configure(IPAContext &context,
>  	 * use the value from the CameraSensorHelper if one is available.
>  	 */
>  	if (context.configuration.sensor.blackLevel &&
> -	    !(offset00 + offset01 + offset10 + offset11)) {
> -		offset00 = context.configuration.sensor.blackLevel;
> -		offset01 = context.configuration.sensor.blackLevel;
> -		offset10 = context.configuration.sensor.blackLevel;
> -		offset11 = context.configuration.sensor.blackLevel;
> +	    !(offset00_ + offset01_ + offset10_ + offset11_)) {
> +		offset00_ = context.configuration.sensor.blackLevel;
> +		offset01_ = context.configuration.sensor.blackLevel;
> +		offset10_ = context.configuration.sensor.blackLevel;
> +		offset11_ = context.configuration.sensor.blackLevel;
>  	}
>
>  	return 0;
> @@ -100,10 +100,10 @@ void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,
>  	block.header->flags = MALI_C55_PARAM_BLOCK_FL_NONE;
>  	block.header->size = sizeof(mali_c55_params_sensor_off_preshading);
>
> -	block.sensor_offs->chan00 = offset00;
> -	block.sensor_offs->chan01 = offset01;
> -	block.sensor_offs->chan10 = offset10;
> -	block.sensor_offs->chan11 = offset11;
> +	block.sensor_offs->chan00 = offset00_;
> +	block.sensor_offs->chan01 = offset01_;
> +	block.sensor_offs->chan10 = offset10_;
> +	block.sensor_offs->chan11 = offset11_;
>
>  	params->total_size += block.header->size;
>  }
> @@ -126,10 +126,10 @@ void BlackLevelCorrection::process([[maybe_unused]] IPAContext &context,
>  	 * \todo Account for bayer order.
>  	 */
>  	metadata.set(controls::SensorBlackLevels, {
> -		static_cast<int32_t>(offset00 >> 4),
> -		static_cast<int32_t>(offset01 >> 4),
> -		static_cast<int32_t>(offset10 >> 4),
> -		static_cast<int32_t>(offset11 >> 4),
> +		static_cast<int32_t>(offset00_ >> 4),
> +		static_cast<int32_t>(offset01_ >> 4),
> +		static_cast<int32_t>(offset10_ >> 4),
> +		static_cast<int32_t>(offset11_ >> 4),
>  	});
>  }
>
> diff --git a/src/ipa/mali-c55/algorithms/blc.h b/src/ipa/mali-c55/algorithms/blc.h
> index 9696e8e9f2aa..29dcafdfec70 100644
> --- a/src/ipa/mali-c55/algorithms/blc.h
> +++ b/src/ipa/mali-c55/algorithms/blc.h
> @@ -32,10 +32,10 @@ private:
>  	static constexpr uint32_t kMaxOffset = 0xfffff;
>
>  	bool tuningParameters_;
> -	uint32_t offset00;
> -	uint32_t offset01;
> -	uint32_t offset10;
> -	uint32_t offset11;
> +	uint32_t offset00_;
> +	uint32_t offset01_;
> +	uint32_t offset10_;
> +	uint32_t offset11_;
>  };
>
>  } /* namespace ipa::mali_c55::algorithms */
> --
> 2.51.0
>
Barnabás Pőcze Oct. 23, 2025, 6:09 p.m. UTC | #2 
2025. 10. 11. 18:03 keltezéssel, Kieran Bingham írta:
> Rename the offset variables to use a suffixed '_' to make
> it clear these variables are stored in the class.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

I guess the title should be capitalized: "Mark offset ...."

Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>


> ---
>   src/ipa/mali-c55/algorithms/blc.cpp | 42 ++++++++++++++---------------
>   src/ipa/mali-c55/algorithms/blc.h   |  8 +++---
>   2 files changed, 25 insertions(+), 25 deletions(-)
> 
> diff --git a/src/ipa/mali-c55/algorithms/blc.cpp b/src/ipa/mali-c55/algorithms/blc.cpp
> index 2a54c86a91f8..85642c0435a2 100644
> --- a/src/ipa/mali-c55/algorithms/blc.cpp
> +++ b/src/ipa/mali-c55/algorithms/blc.cpp
> @@ -38,13 +38,13 @@ BlackLevelCorrection::BlackLevelCorrection()
>   int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,
>   			       const YamlObject &tuningData)
>   {
> -	offset00 = tuningData["offset00"].get<uint32_t>(0);
> -	offset01 = tuningData["offset01"].get<uint32_t>(0);
> -	offset10 = tuningData["offset10"].get<uint32_t>(0);
> -	offset11 = tuningData["offset11"].get<uint32_t>(0);
> +	offset00_ = tuningData["offset00"].get<uint32_t>(0);
> +	offset01_ = tuningData["offset01"].get<uint32_t>(0);
> +	offset10_ = tuningData["offset10"].get<uint32_t>(0);
> +	offset11_ = tuningData["offset11"].get<uint32_t>(0);
>   
> -	if (offset00 > kMaxOffset || offset01 > kMaxOffset ||
> -	    offset10 > kMaxOffset || offset11 > kMaxOffset) {
> +	if (offset00_ > kMaxOffset || offset01_ > kMaxOffset ||
> +	    offset10_ > kMaxOffset || offset11_ > kMaxOffset) {
>   		LOG(MaliC55Blc, Error) << "Invalid black level offsets";
>   		return -EINVAL;
>   	}
> @@ -52,8 +52,8 @@ int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,
>   	tuningParameters_ = true;
>   
>   	LOG(MaliC55Blc, Debug)
> -		<< "Black levels: 00 " << offset00 << ", 01 " << offset01
> -		<< ", 10 " << offset10 << ", 11 " << offset11;
> +		<< "Black levels: 00 " << offset00_ << ", 01 " << offset01_
> +		<< ", 10 " << offset10_ << ", 11 " << offset11_;
>   
>   	return 0;
>   }
> @@ -69,11 +69,11 @@ int BlackLevelCorrection::configure(IPAContext &context,
>   	 * use the value from the CameraSensorHelper if one is available.
>   	 */
>   	if (context.configuration.sensor.blackLevel &&
> -	    !(offset00 + offset01 + offset10 + offset11)) {
> -		offset00 = context.configuration.sensor.blackLevel;
> -		offset01 = context.configuration.sensor.blackLevel;
> -		offset10 = context.configuration.sensor.blackLevel;
> -		offset11 = context.configuration.sensor.blackLevel;
> +	    !(offset00_ + offset01_ + offset10_ + offset11_)) {
> +		offset00_ = context.configuration.sensor.blackLevel;
> +		offset01_ = context.configuration.sensor.blackLevel;
> +		offset10_ = context.configuration.sensor.blackLevel;
> +		offset11_ = context.configuration.sensor.blackLevel;
>   	}
>   
>   	return 0;
> @@ -100,10 +100,10 @@ void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,
>   	block.header->flags = MALI_C55_PARAM_BLOCK_FL_NONE;
>   	block.header->size = sizeof(mali_c55_params_sensor_off_preshading);
>   
> -	block.sensor_offs->chan00 = offset00;
> -	block.sensor_offs->chan01 = offset01;
> -	block.sensor_offs->chan10 = offset10;
> -	block.sensor_offs->chan11 = offset11;
> +	block.sensor_offs->chan00 = offset00_;
> +	block.sensor_offs->chan01 = offset01_;
> +	block.sensor_offs->chan10 = offset10_;
> +	block.sensor_offs->chan11 = offset11_;
>   
>   	params->total_size += block.header->size;
>   }
> @@ -126,10 +126,10 @@ void BlackLevelCorrection::process([[maybe_unused]] IPAContext &context,
>   	 * \todo Account for bayer order.
>   	 */
>   	metadata.set(controls::SensorBlackLevels, {
> -		static_cast<int32_t>(offset00 >> 4),
> -		static_cast<int32_t>(offset01 >> 4),
> -		static_cast<int32_t>(offset10 >> 4),
> -		static_cast<int32_t>(offset11 >> 4),
> +		static_cast<int32_t>(offset00_ >> 4),
> +		static_cast<int32_t>(offset01_ >> 4),
> +		static_cast<int32_t>(offset10_ >> 4),
> +		static_cast<int32_t>(offset11_ >> 4),
>   	});
>   }
>   
> diff --git a/src/ipa/mali-c55/algorithms/blc.h b/src/ipa/mali-c55/algorithms/blc.h
> index 9696e8e9f2aa..29dcafdfec70 100644
> --- a/src/ipa/mali-c55/algorithms/blc.h
> +++ b/src/ipa/mali-c55/algorithms/blc.h
> @@ -32,10 +32,10 @@ private:
>   	static constexpr uint32_t kMaxOffset = 0xfffff;
>   
>   	bool tuningParameters_;
> -	uint32_t offset00;
> -	uint32_t offset01;
> -	uint32_t offset10;
> -	uint32_t offset11;
> +	uint32_t offset00_;
> +	uint32_t offset01_;
> +	uint32_t offset10_;
> +	uint32_t offset11_;
>   };
>   
>   } /* namespace ipa::mali_c55::algorithms */

Patch
diff mbox series 

diff --git a/src/ipa/mali-c55/algorithms/blc.cpp b/src/ipa/mali-c55/algorithms/blc.cpp
index 2a54c86a91f8..85642c0435a2 100644
--- a/src/ipa/mali-c55/algorithms/blc.cpp
+++ b/src/ipa/mali-c55/algorithms/blc.cpp
@@ -38,13 +38,13 @@  BlackLevelCorrection::BlackLevelCorrection()
 int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,
 			       const YamlObject &tuningData)
 {
-	offset00 = tuningData["offset00"].get<uint32_t>(0);
-	offset01 = tuningData["offset01"].get<uint32_t>(0);
-	offset10 = tuningData["offset10"].get<uint32_t>(0);
-	offset11 = tuningData["offset11"].get<uint32_t>(0);
+	offset00_ = tuningData["offset00"].get<uint32_t>(0);
+	offset01_ = tuningData["offset01"].get<uint32_t>(0);
+	offset10_ = tuningData["offset10"].get<uint32_t>(0);
+	offset11_ = tuningData["offset11"].get<uint32_t>(0);
 
-	if (offset00 > kMaxOffset || offset01 > kMaxOffset ||
-	    offset10 > kMaxOffset || offset11 > kMaxOffset) {
+	if (offset00_ > kMaxOffset || offset01_ > kMaxOffset ||
+	    offset10_ > kMaxOffset || offset11_ > kMaxOffset) {
 		LOG(MaliC55Blc, Error) << "Invalid black level offsets";
 		return -EINVAL;
 	}
@@ -52,8 +52,8 @@  int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,
 	tuningParameters_ = true;
 
 	LOG(MaliC55Blc, Debug)
-		<< "Black levels: 00 " << offset00 << ", 01 " << offset01
-		<< ", 10 " << offset10 << ", 11 " << offset11;
+		<< "Black levels: 00 " << offset00_ << ", 01 " << offset01_
+		<< ", 10 " << offset10_ << ", 11 " << offset11_;
 
 	return 0;
 }
@@ -69,11 +69,11 @@  int BlackLevelCorrection::configure(IPAContext &context,
 	 * use the value from the CameraSensorHelper if one is available.
 	 */
 	if (context.configuration.sensor.blackLevel &&
-	    !(offset00 + offset01 + offset10 + offset11)) {
-		offset00 = context.configuration.sensor.blackLevel;
-		offset01 = context.configuration.sensor.blackLevel;
-		offset10 = context.configuration.sensor.blackLevel;
-		offset11 = context.configuration.sensor.blackLevel;
+	    !(offset00_ + offset01_ + offset10_ + offset11_)) {
+		offset00_ = context.configuration.sensor.blackLevel;
+		offset01_ = context.configuration.sensor.blackLevel;
+		offset10_ = context.configuration.sensor.blackLevel;
+		offset11_ = context.configuration.sensor.blackLevel;
 	}
 
 	return 0;
@@ -100,10 +100,10 @@  void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,
 	block.header->flags = MALI_C55_PARAM_BLOCK_FL_NONE;
 	block.header->size = sizeof(mali_c55_params_sensor_off_preshading);
 
-	block.sensor_offs->chan00 = offset00;
-	block.sensor_offs->chan01 = offset01;
-	block.sensor_offs->chan10 = offset10;
-	block.sensor_offs->chan11 = offset11;
+	block.sensor_offs->chan00 = offset00_;
+	block.sensor_offs->chan01 = offset01_;
+	block.sensor_offs->chan10 = offset10_;
+	block.sensor_offs->chan11 = offset11_;
 
 	params->total_size += block.header->size;
 }
@@ -126,10 +126,10 @@  void BlackLevelCorrection::process([[maybe_unused]] IPAContext &context,
 	 * \todo Account for bayer order.
 	 */
 	metadata.set(controls::SensorBlackLevels, {
-		static_cast<int32_t>(offset00 >> 4),
-		static_cast<int32_t>(offset01 >> 4),
-		static_cast<int32_t>(offset10 >> 4),
-		static_cast<int32_t>(offset11 >> 4),
+		static_cast<int32_t>(offset00_ >> 4),
+		static_cast<int32_t>(offset01_ >> 4),
+		static_cast<int32_t>(offset10_ >> 4),
+		static_cast<int32_t>(offset11_ >> 4),
 	});
 }
 
diff --git a/src/ipa/mali-c55/algorithms/blc.h b/src/ipa/mali-c55/algorithms/blc.h
index 9696e8e9f2aa..29dcafdfec70 100644
--- a/src/ipa/mali-c55/algorithms/blc.h
+++ b/src/ipa/mali-c55/algorithms/blc.h
@@ -32,10 +32,10 @@  private:
 	static constexpr uint32_t kMaxOffset = 0xfffff;
 
 	bool tuningParameters_;
-	uint32_t offset00;
-	uint32_t offset01;
-	uint32_t offset10;
-	uint32_t offset11;
+	uint32_t offset00_;
+	uint32_t offset01_;
+	uint32_t offset10_;
+	uint32_t offset11_;
 };
 
 } /* namespace ipa::mali_c55::algorithms */