[libcamera-devel,2/2] ipa: ipu3: agc: Use existing local short-hand variable in configure()
diff mbox series

Message ID 20220315133407.32348-2-laurent.pinchart@ideasonboard.com
State Accepted
Commit 4774d36779c49ee17e73109a86cb6205d8681f3a
Headers show
Series
  • [libcamera-devel,1/2] ipa: ipu3: agc: Reset frame count when configuring AGC
Related show

Commit Message

Laurent Pinchart March 15, 2022, 1:34 p.m. UTC
The configure() function has a local configuration variable referencing
context.configuration for the purpose of shortening lines. Use it
instead of context.configuration in the remaining locations, and
constify it while at it as the configuration isn't meant to be modified.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/ipu3/algorithms/agc.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Nicolas Dufresne via libcamera-devel March 15, 2022, 1:39 p.m. UTC | #1
Hi Laurent,

On 15/03/2022 14:34, Laurent Pinchart via libcamera-devel wrote:
> The configure() function has a local configuration variable referencing
> context.configuration for the purpose of shortening lines. Use it
> instead of context.configuration in the remaining locations, and
> constify it while at it as the configuration isn't meant to be modified.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Thanks, it is indeed shorter and cleaner now :-).

Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>

> ---
>   src/ipa/ipu3/algorithms/agc.cpp | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp
> index 70cff3fed43c..7d4b3503f390 100644
> --- a/src/ipa/ipu3/algorithms/agc.cpp
> +++ b/src/ipa/ipu3/algorithms/agc.cpp
> @@ -86,17 +86,17 @@ Agc::Agc()
>   int Agc::configure(IPAContext &context,
>   		   [[maybe_unused]] const IPAConfigInfo &configInfo)
>   {
> -	IPASessionConfiguration &configuration = context.configuration;
> +	const IPASessionConfiguration &configuration = context.configuration;
>   	IPAFrameContext &frameContext = context.frameContext;
>   
>   	stride_ = configuration.grid.stride;
>   
> -	minShutterSpeed_ = context.configuration.agc.minShutterSpeed;
> -	maxShutterSpeed_ = std::min(context.configuration.agc.maxShutterSpeed,
> +	minShutterSpeed_ = configuration.agc.minShutterSpeed;
> +	maxShutterSpeed_ = std::min(configuration.agc.maxShutterSpeed,
>   				    kMaxShutterSpeed);
>   
> -	minAnalogueGain_ = std::max(context.configuration.agc.minAnalogueGain, kMinAnalogueGain);
> -	maxAnalogueGain_ = std::min(context.configuration.agc.maxAnalogueGain, kMaxAnalogueGain);
> +	minAnalogueGain_ = std::max(configuration.agc.minAnalogueGain, kMinAnalogueGain);
> +	maxAnalogueGain_ = std::min(configuration.agc.maxAnalogueGain, kMaxAnalogueGain);
>   
>   	/* Configure the default exposure and gain. */
>   	frameContext.agc.gain = std::max(minAnalogueGain_, kMinAnalogueGain);
Nicolas Dufresne via libcamera-devel March 15, 2022, 1:53 p.m. UTC | #2
Hi Laurent,

On 3/15/22 19:04, Laurent Pinchart via libcamera-devel wrote:
> The configure() function has a local configuration variable referencing
> context.configuration for the purpose of shortening lines. Use it
> instead of context.configuration in the remaining locations, and
> constify it while at it as the configuration isn't meant to be modified.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>

> ---
>   src/ipa/ipu3/algorithms/agc.cpp | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp
> index 70cff3fed43c..7d4b3503f390 100644
> --- a/src/ipa/ipu3/algorithms/agc.cpp
> +++ b/src/ipa/ipu3/algorithms/agc.cpp
> @@ -86,17 +86,17 @@ Agc::Agc()
>   int Agc::configure(IPAContext &context,
>   		   [[maybe_unused]] const IPAConfigInfo &configInfo)
>   {
> -	IPASessionConfiguration &configuration = context.configuration;
> +	const IPASessionConfiguration &configuration = context.configuration;
>   	IPAFrameContext &frameContext = context.frameContext;
>   
>   	stride_ = configuration.grid.stride;
>   
> -	minShutterSpeed_ = context.configuration.agc.minShutterSpeed;
> -	maxShutterSpeed_ = std::min(context.configuration.agc.maxShutterSpeed,
> +	minShutterSpeed_ = configuration.agc.minShutterSpeed;
> +	maxShutterSpeed_ = std::min(configuration.agc.maxShutterSpeed,
>   				    kMaxShutterSpeed);
>   
> -	minAnalogueGain_ = std::max(context.configuration.agc.minAnalogueGain, kMinAnalogueGain);
> -	maxAnalogueGain_ = std::min(context.configuration.agc.maxAnalogueGain, kMaxAnalogueGain);
> +	minAnalogueGain_ = std::max(configuration.agc.minAnalogueGain, kMinAnalogueGain);
> +	maxAnalogueGain_ = std::min(configuration.agc.maxAnalogueGain, kMaxAnalogueGain);
>   
>   	/* Configure the default exposure and gain. */
>   	frameContext.agc.gain = std::max(minAnalogueGain_, kMinAnalogueGain);

Patch
diff mbox series

diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp
index 70cff3fed43c..7d4b3503f390 100644
--- a/src/ipa/ipu3/algorithms/agc.cpp
+++ b/src/ipa/ipu3/algorithms/agc.cpp
@@ -86,17 +86,17 @@  Agc::Agc()
 int Agc::configure(IPAContext &context,
 		   [[maybe_unused]] const IPAConfigInfo &configInfo)
 {
-	IPASessionConfiguration &configuration = context.configuration;
+	const IPASessionConfiguration &configuration = context.configuration;
 	IPAFrameContext &frameContext = context.frameContext;
 
 	stride_ = configuration.grid.stride;
 
-	minShutterSpeed_ = context.configuration.agc.minShutterSpeed;
-	maxShutterSpeed_ = std::min(context.configuration.agc.maxShutterSpeed,
+	minShutterSpeed_ = configuration.agc.minShutterSpeed;
+	maxShutterSpeed_ = std::min(configuration.agc.maxShutterSpeed,
 				    kMaxShutterSpeed);
 
-	minAnalogueGain_ = std::max(context.configuration.agc.minAnalogueGain, kMinAnalogueGain);
-	maxAnalogueGain_ = std::min(context.configuration.agc.maxAnalogueGain, kMaxAnalogueGain);
+	minAnalogueGain_ = std::max(configuration.agc.minAnalogueGain, kMinAnalogueGain);
+	maxAnalogueGain_ = std::min(configuration.agc.maxAnalogueGain, kMaxAnalogueGain);
 
 	/* Configure the default exposure and gain. */
 	frameContext.agc.gain = std::max(minAnalogueGain_, kMinAnalogueGain);