[libcamera-devel,v3,1/4] src: ipa: raspberrypi: Avoid AGC filtering when both gain and shutter specified
diff mbox series

Message ID 20201126142321.5563-2-david.plowman@raspberrypi.com
State Accepted
Commit 1b5001e92fbe9f4bbbbef89425dfd81a9e080ac9
Headers show
Series
  • Raspberry Pi AGC improvements
Related show

Commit Message

David Plowman Nov. 26, 2020, 2:23 p.m. UTC 
When both gain and shutter have been directly specified, do not filter
slowly towards those target values, but adopt them immediately. This
should match user expectations better.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/raspberrypi/controller/rpi/agc.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Kieran Bingham Nov. 30, 2020, 10:59 a.m. UTC | #1 
Hi David,

Ooops, I reviewed the previous series when this had already hit the list.


Bringing my tags forwards:

On 26/11/2020 14:23, David Plowman wrote:
> When both gain and shutter have been directly specified, do not filter
> slowly towards those target values, but adopt them immediately. This
> should match user expectations better.
> 
> Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
> Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  src/ipa/raspberrypi/controller/rpi/agc.cpp | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp
> index 4c56bdc9..30a1c1c1 100644
> --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp
> +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp
> @@ -588,7 +588,12 @@ bool Agc::applyDigitalGain(double gain, double target_Y)
>  
>  void Agc::filterExposure(bool desaturate)
>  {
> -	double speed = frame_count_ <= config_.startup_frames ? 1.0 : config_.speed;
> +	double speed = config_.speed;
> +	// AGC adapts instantly if both shutter and gain are directly specified
> +	// or we're in the startup phase.
> +	if ((status_.fixed_shutter && status_.fixed_analogue_gain) ||
> +	    frame_count_ <= config_.startup_frames)
> +		speed = 1.0;
>  	if (filtered_.total_exposure == 0.0) {
>  		filtered_.total_exposure = target_.total_exposure;
>  		filtered_.total_exposure_no_dg = target_.total_exposure_no_dg;
>

Patch
diff mbox series 

diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp
index 4c56bdc9..30a1c1c1 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp
@@ -588,7 +588,12 @@  bool Agc::applyDigitalGain(double gain, double target_Y)
 
 void Agc::filterExposure(bool desaturate)
 {
-	double speed = frame_count_ <= config_.startup_frames ? 1.0 : config_.speed;
+	double speed = config_.speed;
+	// AGC adapts instantly if both shutter and gain are directly specified
+	// or we're in the startup phase.
+	if ((status_.fixed_shutter && status_.fixed_analogue_gain) ||
+	    frame_count_ <= config_.startup_frames)
+		speed = 1.0;
 	if (filtered_.total_exposure == 0.0) {
 		filtered_.total_exposure = target_.total_exposure;
 		filtered_.total_exposure_no_dg = target_.total_exposure_no_dg;