[v1] ipa: rkisp1: Fix mira220 tuning file

28663 diff mbox series

The tuning file has been generated before 974102049a41
("libcamera: controls: Remove common enum prefix") but it was merged after
it without updating. This unfortunately means that the modes it defines now
exist with different names. Fix that.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 src/ipa/rkisp1/data/mira220.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Ah, upsie

On Thu, Oct 29, 2026 at 12:26:51PM +0100, Barnabás Pőcze wrote:
> The tuning file has been generated before 974102049a41
> ("libcamera: controls: Remove common enum prefix") but it was merged after
> it without updating. This unfortunately means that the modes it defines now
> exist with different names. Fix that.

I was running a libcamera version that pre-dates 974102049a41 indeed

Thanks for fixing
>
> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>

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

Please fast-track this for 0.8 :)

> ---
>  src/ipa/rkisp1/data/mira220.yaml | 28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/src/ipa/rkisp1/data/mira220.yaml b/src/ipa/rkisp1/data/mira220.yaml
> index 9dc97d63d7..4751d311a8 100644
> --- a/src/ipa/rkisp1/data/mira220.yaml
> +++ b/src/ipa/rkisp1/data/mira220.yaml
> @@ -5,23 +5,23 @@ version: 1
>  algorithms:
>    - Agc:
>        AeMeteringMode:
> -        MeteringCentreWeighted: [ 0, 0, 0, 0, 0, 0, 6, 8, 6, 0, 0, 8, 16, 8, 0, 0, 6, 8, 6, 0, 0, 0, 0, 0, 0 ]
> -        MeteringSpot: [ 0, 0, 0, 0, 0, 0, 2, 4, 2, 0, 0, 4, 16, 4, 0, 0, 2, 4, 2, 0, 0, 0, 0, 0, 0 ]
> -        MeteringMatrix: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
> +        CentreWeighted: [ 0, 0, 0, 0, 0, 0, 6, 8, 6, 0, 0, 8, 16, 8, 0, 0, 6, 8, 6, 0, 0, 0, 0, 0, 0 ]
> +        Spot: [ 0, 0, 0, 0, 0, 0, 2, 4, 2, 0, 0, 4, 16, 4, 0, 0, 2, 4, 2, 0, 0, 0, 0, 0, 0 ]
> +        Matrix: [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ]
>        AeExposureMode:
> -        ExposureNormal:
> +        Normal:
>            exposureTime: [ 100, 10000, 30000, 60000, 120000 ]
>            gain: [ 2.0, 4.0, 6.0, 6.0, 6.0 ]
> -        ExposureShort:
> +        Short:
>            exposureTime: [ 100, 5000, 10000, 20000, 120000 ]
>            gain: [ 2.0, 4.0, 6.0, 6.0, 6.0 ]
>        AeConstraintMode:
> -        ConstraintNormal:
> +        Normal:
>            lower:
>              qLo: 0.98
>              qHi: 1.0
>              yTarget: 0.5
> -        ConstraintHighlight:
> +        Highlight:
>            lower:
>              qLo: 0.98
>              qHi: 1.0
> @@ -40,25 +40,25 @@ algorithms:
>    - Awb:
>        algorithm: "bayes"
>        AwbMode:
> -        AwbAuto:
> +        Auto:
>            lo: 2500
>            hi: 8000
> -        AwbIncandescent:
> +        Incandescent:
>            lo: 2500
>            hi: 3000
> -        AwbTungsten:
> +        Tungsten:
>            lo: 3000
>            hi: 3500
> -        AwbFluorescent:
> +        Fluorescent:
>            lo: 4000
>            hi: 4700
> -        AwbIndoor:
> +        Indoor:
>            lo: 3000
>            hi: 5000
> -        AwbDaylight:
> +        Daylight:
>            lo: 5500
>            hi: 6500
> -        AwbCloudy:
> +        Cloudy:
>            lo: 6500
>            hi: 8000
>        priors:
> --
> 2.56.0
>

Quoting Jacopo Mondi (2026-10-29 11:40:00)
> Ah, upsie
> 
> On Thu, Oct 29, 2026 at 12:26:51PM +0100, Barnabás Pőcze wrote:
> > The tuning file has been generated before 974102049a41
> > ("libcamera: controls: Remove common enum prefix") but it was merged after
> > it without updating. This unfortunately means that the modes it defines now
> > exist with different names. Fix that.
> 
> I was running a libcamera version that pre-dates 974102049a41 indeed
> 
> Thanks for fixing
> >
> > Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> 
> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> 
> Please fast-track this for 0.8 :)
> 

Ack!


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