From patchwork Thu Apr 22 09:40:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12075 X-Patchwork-Delegate: paul.elder@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 60B94BDB17 for ; Thu, 22 Apr 2021 09:41:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D358468863; Thu, 22 Apr 2021 11:41:30 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="siGthfA6"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7979A68866 for ; Thu, 22 Apr 2021 11:41:27 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1EEDF3EE; Thu, 22 Apr 2021 11:41:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1619084487; bh=AfHgskQzbZnCKUuTmS4VrHZbo/Ol9dJIPc7mY5BTcuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=siGthfA69jafD2hJ6sFTDq58dUscSIpteJe6IDcyY9RLmzpJym5heuDpVOyOCco6r HLI2oFvRc8JAGatlodE+lhy9cOykGddOGxJ7z0tq5rbuKA5eRRRfz3TQJIwaPbuArS 747sbl20I9FO1TDkhTWdMOCQhe/TUdpb6EGwl4lo= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 22 Apr 2021 18:40:58 +0900 Message-Id: <20210422094102.371772-9-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210422094102.371772-1-paul.elder@ideasonboard.com> References: <20210422094102.371772-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2 08/12] controls: Add controls necessary for FULL compliance 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add controls necessary for FULL compliance: - BlackLevelLocked - EdgeMode - FrameDuration - SensorSensitivity - TonemapMode While at it, change the names of some AwbState values to be consistent and to avoid potential conflicts with AwbLocked. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- src/libcamera/control_ids.yaml | 78 +++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml index f025819a..61c5c96f 100644 --- a/src/libcamera/control_ids.yaml +++ b/src/libcamera/control_ids.yaml @@ -420,6 +420,13 @@ controls: The camera will cancel any active trigger and the AF routine is reset to its initial state. + - BlackLevelLocked: + type: bool + draft: true + description: | + Whether black-level compensation is locked to its current values, or is + free to vary. Currently identical to ANDROID_BLACK_LEVEL_LOCK. + - NoiseReductionMode: type: int32_t draft: true @@ -554,13 +561,46 @@ controls: - name: AwbStateSearching value: 1 description: The AWB algorithm has not converged yet. - - name: AwbConverged + - name: AwbStateConverged value: 2 description: The AWB algorithm has converged. - - name: AwbLocked + - name: AwbStateLocked value: 3 description: The AWB algorithm is locked. + - EdgeMode: + type: int32_t + draft: true + description: | + Control to report the operation mode of edge enhancement. Currently + identical to ANDROID_EDGE_MODE. + enum: + - name: EdgeModeOff + value: 0 + description: No edge enhancement is applied. + - name: EdgeModeFast + value: 1 + description: | + Apply edge enhancement at a quality level tha does not + slow down frame rate relative to sensor output. + - name: EdgeModeHighQuality + value: 2 + description: | + Apply high-quality edge enhancement, at a cost of possible reduced + output frame rate. + - name: EdgeModeZSL + value: 3 + description: | + Edge enhancement is applied at different levels for different output + streams, based on resolution. + + - FrameDuration: + type: int64_t + draft: true + description: | + Duration from start of frame exposure to start of next frame exposure, in + nanoseconds. Currently identical to ANDROID_SENSOR_FRAME_DURATION. + - SensorRollingShutterSkew: type: int64_t draft: true @@ -569,6 +609,13 @@ controls: row and the start of exposure of the last row. Currently identical to ANDROID_SENSOR_ROLLING_SHUTTER_SKEW + - SensorSensitivity: + type: int32_t + draft: true + description: | + The amount of gain applied to sensor data before processing. Currently + identical to ANDROID_SENSOR_SENSITIVITY. + - LensShadingMapMode: type: int32_t draft: true @@ -600,6 +647,33 @@ controls: value: 2 description: 60Hz flickering detected. + - TonemapMode: + type: int32_t + draft: true + description: | + High-level global contrast/gamma/tonemapping control. Currently identical + to ANDROID_TONEMAP_MODE. + enum: + - name: TonemapModeContrastCurve + value: 0 + description: Use the specified tonemapping curve. + - name: TonemapModeFast + value: 1 + description: | + Advanced gamma mapping and color enhancement may be applied, without + reducing frame rate compared to raw sensor output. + - name: TonemapModeHighQuality + value: 2 + description: | + High-quality gamma mapping and color enhancement will be applied, at + the cost of possibly reduced frame rate compared to raw sensor output. + - name: TonemapModeGammaValue + value: 3 + description: Use the specified gamma value for tonemapping. + - name: TonemapModePresetCurve + value: 4 + description: Use the specified preset tonemapping curve. + - PipelineDepth: type: int32_t draft: true