From patchwork Fri Apr 24 10:46:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 3516 Return-Path: Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1327662E4D for ; Fri, 24 Apr 2020 12:47:16 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="LmaJOJc4"; dkim-atps=neutral Received: by mail-wm1-x342.google.com with SMTP id h2so9922625wmb.4 for ; Fri, 24 Apr 2020 03:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+zSZHtzXchYfw0fqgz7s1r72uZCsipbTAkT1AW69Vaw=; b=LmaJOJc4ao00m2oe2txYpdTiXa4bqiX+Otv6X4SLBLJ8j05mIyfGX19WGjLcuVIZQT nupHrvmwJ+PsnpVNiwqXRK66ZoYj4DYkOMCfrkE1klFr3nIlWjHZYgVK8uimf7P04l8o GDraNfD33YozEkM6PC6l0+C4m9whjgU6BS3x2NgL2iWD1uwLt4XHlaSef55gP0qG+rW4 b75KKdoiNuyHeotqBBUiC0Ef1atvg2Q3N8wZkBfBKoFov+mg/Gzolsd/C5PMghR1IqW0 9aOC0ffBia6QYi8FtcCJGZ0tgHS2Fcvj1tkBct8hI1ge38N8VeLc/mzais4ThroIZKvZ ZANw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+zSZHtzXchYfw0fqgz7s1r72uZCsipbTAkT1AW69Vaw=; b=Ai8cwyWXRtuBt7GZTaPwm909O+FpT2j0h9nNPgMisn92dJz5iuD0sZdYgPBPSFL2BG sg8u+pP7Imor/2EAnhfbmUJ98A8j+Lk+97Dfb3/dsi1Xgd0raU6jO/gMLNY8I1xTjCQv xyB9yTWNETYG85Qku2c54QT7m9uGew1VInYgeyMrnw+rNC9et3CvzczRQPL7JCiUhNfe FUR/kh5ng4B6Pcl0O1HCPDYgh7eTiq37rAvcGAlbYSmqVkHN+TDgFZVtn9mSlir7h7rv a1SbvPkdo5gtTjUtwFammC1EBwjQMHTIOpJaUBRmxRaWrallnQOTfWWNRACtsZzDWMlw gz+Q== X-Gm-Message-State: AGi0PuaGTc4gNRthY2fOfBBCdhFr8/lOSne5qpjmbgxUufj1PhyP/Kac ND2up7mCehDj5V7qkJLR1EkQJpXO/sPlNw== X-Google-Smtp-Source: APiQypLV7lLpQhjq7LPnGgGxYpAdpbryxOo1mCg6SXYGslQ7SbjPlGEUCvfQw5iX3wIkeABNW+aLDQ== X-Received: by 2002:a05:600c:214b:: with SMTP id v11mr9967224wml.151.1587725235368; Fri, 24 Apr 2020 03:47:15 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id j68sm7884997wrj.32.2020.04.24.03.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2020 03:47:14 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 24 Apr 2020 11:46:59 +0100 Message-Id: <20200424104700.26819-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200424104700.26819-1-naush@raspberrypi.com> References: <20200424104700.26819-1-naush@raspberrypi.com> Subject: [libcamera-devel] [PATCH v4 4/5] libcamera: controls: Add AE related controls X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 10:47:16 -0000 AeMeteringMode, AeConstraintMode, and AeExposureMode are new enum type controls used to specify operating modes in the AE algorithm. All modes may not be supported by all platforms. ExposureValue is a new control used to set the log2 exposure adjustment for the AE algorithm. Lux is a new control that returns the current lux estimate. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart --- src/libcamera/control_ids.yaml | 109 +++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml index f7403081..f66b851b 100644 --- a/src/libcamera/control_ids.yaml +++ b/src/libcamera/control_ids.yaml @@ -25,6 +25,109 @@ controls: \sa AeEnable + # AeMeteringMode needs further attention: + # - Auto-generate max enum value. + # - Better handling of custom types. + - AeMeteringMode: + type: int32_t + description: | + Specify a metering mode for the AE algorithm to use. The metering + modes determine which parts of the image are used to determine the + scene brightness. Metering modes may be platform specific and not + all metering modes may be supported. + enum: + - name: MeteringCentreWeighted + value: 0 + description: Centre-weighted metering mode. + - name: MeteringSpot + value: 1 + description: Spot metering mode. + - name: MeteringMatrix + value: 2 + description: Matrix metering mode. + - 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. + # - Better handling of custom types. + - AeConstraintMode: + type: int32_t + description: | + Specify a constraint mode for the AE algorithm to use. These determine + how the measured scene brightness is adjusted to reach the desired + target exposure. Constraint modes may be platform specific, and not + all constraint modes may be supported. + enum: + - name: ConstraintNormal + value: 0 + description: Default constraint mode. + This mode aims to balance the exposure of different parts of the + image so as to reach a reasonable average level. However, highlights + in the image may appear over-exposed and lowlights may appear + under-exposed. + - name: ConstraintHighlight + value: 1 + description: Highlight constraint mode. + This mode adjusts the exposure levels in order to try and avoid + over-exposing the brightest parts (highlights) of an image. + Other non-highlight parts of the image may appear under-exposed. + - name: ConstraintShadows + value: 2 + description: Shadows constraint mode. + This mode adjusts the exposure levels in order to try and avoid + under-exposing the dark parts (shadows) of an image. Other normally + exposed parts of the image may appear over-exposed. + - 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. + # - Better handling of custom types. + - AeExposureMode: + type: int32_t + description: | + Specify an exposure mode for the AE algorithm to use. These specify + how the desired total exposure is divided between the shutter time + and the sensor's analogue gain. The exposure modes are platform + specific, and not all exposure modes may be supported. + enum: + - name: ExposureNormal + value: 0 + description: Default exposure mode. + - name: ExposureShort + value: 1 + description: Exposure mode allowing only short exposure times. + - name: ExposureLong + value: 2 + description: Exposure mode allowing long exposure times. + - 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 + description: | + Specify an Exposure Value (EV) parameter. The EV parameter will only be + applied if the AE algorithm is currently enabled. + + By convention EV adjusts the exposure as log2. For example + EV = [-2, -1, 0.5, 0, 0.5, 1, 2] results in an exposure adjustment + of [1/4x, 1/2x, 1/sqrt(2)x, 1x, sqrt(2)x, 2x, 4x]. + + \sa AeEnable + - ExposureTime: type: int32_t description: | @@ -55,6 +158,12 @@ controls: Specify a fixed contrast parameter. Normal contrast is given by the value 1.0; larger values produce images with more contrast. + - Lux: + type: float + description: | + Report an estimate of the current illuminance level in lux. The Lux + control can only be returned in metadata. + - AwbEnable: type: bool description: |