[libcamera-devel,v2,07/13] libcamera: control_ids: Remove max values in enumerations
diff mbox series

Message ID 20201020180534.36855-8-jacopo@jmondi.org
State Accepted
Headers show
Series
  • libcamera: Introduce draft controls
Related show

Commit Message

Jacopo Mondi Oct. 20, 2020, 6:05 p.m. UTC
The libcamera control definition schema includes a placeholder
maximum value for each enumeration of supported values.

As it is now possible to create ControlInfo from the list of enumerated
values, it is not necessary to generate the placeholder value anymore.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/control_ids.yaml | 12 ------------
 1 file changed, 12 deletions(-)

Comments

Kieran Bingham Oct. 21, 2020, 1:01 p.m. UTC | #1
Hi Jacopo,

On 20/10/2020 19:05, Jacopo Mondi wrote:
> The libcamera control definition schema includes a placeholder
> maximum value for each enumeration of supported values.
> 
> As it is now possible to create ControlInfo from the list of enumerated
> values, it is not necessary to generate the placeholder value anymore.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Excellent, now there's no chance of these getting out-of-date and incorrect.

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

> ---
>  src/libcamera/control_ids.yaml | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml
> index 2fca88e36635..637fbace152e 100644
> --- a/src/libcamera/control_ids.yaml
> +++ b/src/libcamera/control_ids.yaml
> @@ -48,9 +48,6 @@ controls:
>          - name: MeteringCustom
>            value: 3
>            description: Custom metering mode.
> -        - name: MeteringModeMax
> -          value: 3
> -          description: Maximum allowed value (place any new values above here).
>  
>    # AeConstraintMode needs further attention:
>    # - Auto-generate max enum value.
> @@ -85,9 +82,6 @@ controls:
>          - name: ConstraintCustom
>            value: 3
>            description: Custom constraint mode.
> -        - name: ConstraintModeMax
> -          value: 3
> -          description: Maximum allowed value (place any new values above here).
>  
>    # AeExposureMode needs further attention:
>    # - Auto-generate max enum value.
> @@ -112,9 +106,6 @@ controls:
>          - name: ExposureCustom
>            value: 3
>            description: Custom exposure mode.
> -        - name: ExposureModeMax
> -          value: 3
> -          description: Maximum allowed value (place any new values above here).
>  
>    - ExposureValue:
>        type: float
> @@ -204,9 +195,6 @@ controls:
>          - name: AwbCustom
>            value: 7
>            description: Custom AWB mode.
> -        - name: AwbModeMax
> -          value: 7
> -          description: Maximum allowed value (place any new values above here).
>  
>    - AwbLocked:
>        type: bool
>

Patch
diff mbox series

diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml
index 2fca88e36635..637fbace152e 100644
--- a/src/libcamera/control_ids.yaml
+++ b/src/libcamera/control_ids.yaml
@@ -48,9 +48,6 @@  controls:
         - name: MeteringCustom
           value: 3
           description: Custom metering mode.
-        - name: MeteringModeMax
-          value: 3
-          description: Maximum allowed value (place any new values above here).
 
   # AeConstraintMode needs further attention:
   # - Auto-generate max enum value.
@@ -85,9 +82,6 @@  controls:
         - name: ConstraintCustom
           value: 3
           description: Custom constraint mode.
-        - name: ConstraintModeMax
-          value: 3
-          description: Maximum allowed value (place any new values above here).
 
   # AeExposureMode needs further attention:
   # - Auto-generate max enum value.
@@ -112,9 +106,6 @@  controls:
         - name: ExposureCustom
           value: 3
           description: Custom exposure mode.
-        - name: ExposureModeMax
-          value: 3
-          description: Maximum allowed value (place any new values above here).
 
   - ExposureValue:
       type: float
@@ -204,9 +195,6 @@  controls:
         - name: AwbCustom
           value: 7
           description: Custom AWB mode.
-        - name: AwbModeMax
-          value: 7
-          description: Maximum allowed value (place any new values above here).
 
   - AwbLocked:
       type: bool