From patchwork Tue Jul 18 14:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 18853 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 E18BCC324D for ; Tue, 18 Jul 2023 14:43:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 546E8628C2; Tue, 18 Jul 2023 16:43:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1689691388; bh=odvmMP1mfbDW4IpPqhAZBKs1y1ZjTvXNU7NEBQ+IzuE=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=1KIqlWUlbDfdLyO6lYhxIPwc4lp6azcyra92Mnnh9KOTCAfG1OkJxX2HvSBpOgBZT NpGAJHLdIiz1MZC/JpKpLZmbtEh83DFLQdRcY4V7sLI6xX8pHa4K4Qrhf837hUWNST xdamPrSUKA5/7Iy7+fmCZs2jtPLiJIJNJchGB5flMwelEXfax+PS+wndv5mRy9STG1 APL5Tay9MxkFdQ0PSCyiIZsEzAl4Ji8HmmuPVXjcKh8RTHU2QljukpXnH46oZPMdJL k6axyfHKiEctlZAfGKdZVcnFY4Oznle/L639ydI9/4ViQ9dJm8ha8hfF0BRmYaM/P7 0gaOWWDOxl2Uw== Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4922961E2B for ; Tue, 18 Jul 2023 16:43:06 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="D1Kn0pH6"; dkim-atps=neutral Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fbf1b82de7so37130105e9.1 for ; Tue, 18 Jul 2023 07:43:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1689691386; x=1692283386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+lbhbtS+PWJC1jWNapWf2Uo+tHj0pyzFh1gsmDnPZcE=; b=D1Kn0pH61oHm4F3obNbUHfot8CVuN/ktRfNLMwWiUaMmBAYiZyTOlT/fGYkGLRia1Z IpoHzl+aMNz+yf8JzeVOsTXfXqNOlZRNovTMVqI8h4nqPhJVvx40FFhCD47IkMygc59J 9OUeBXZ5r++Ck3WHkaDKN+YbbHlG4CmDf6at3AuTTzU6wPVirepJocwM2L5iOykM9Xk2 1fc4OMAtTCc3OJsHMRi3Kl4tQ3sL4Ow7gpxlqaY59Sr5a7GfaqXwABRm91lDxxaPUngh WdJI+sqMBPWaDZh5Lg/VmYwRRE1kWJ+yhtW5/iH3tFpVHasqK/d5qglrVzAvwuVwgk5T dYGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689691386; x=1692283386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+lbhbtS+PWJC1jWNapWf2Uo+tHj0pyzFh1gsmDnPZcE=; b=A5r7pV9M7sGDCE7lV15sZR3NJZ0iROB2jFkdsUkARWoQxpCaBtNK3Rqt7iatVxW5r9 g2guFGBnj8As8cQ1qSUTkiIPPC468JO0Qzi75YiFfEQWYXDb0tcMeh22En/45LEO1g83 JjXgCDwFoTiTAfXzMFEu96GFqUp9rnq1y8/YNyQB3zPH/22DXm1lYcqmDLuhepnroHo0 JwfIUyl1et4fI6TmBgHPe4KgJeb/O+WxXO5AVO7H2xEU4uinQpnEaeGAIUGU/mfZNptM 6ch+HJu87/QLecRmTWPAnt2DKnEWly78/6lwR2O+KA3E3Nrsd918KlGleDbXyN+E0SBe whAQ== X-Gm-Message-State: ABy/qLZu3E29hqbejmx75HI0hJgmmuO4y3UlVt29EKw3t0k+QgShwzYT hk284MhrJjdkego6H1WPUi6ZPOzlmS06YFUv2Eo= X-Google-Smtp-Source: APBJJlGcnbflMaL+r8GcnQyMHcSZ7kYa+HwkS/aF0fZ9P52QQfaFY9g+D9g5Kg6GhN1prH2DwegcFQ== X-Received: by 2002:a05:600c:3c9e:b0:3fa:ef97:1fa5 with SMTP id bg30-20020a05600c3c9e00b003faef971fa5mr2335549wmb.6.1689691385591; Tue, 18 Jul 2023 07:43:05 -0700 (PDT) Received: from pi4-davidp.pitowers.org ([2a00:1098:3142:14:2bce:64d6:1a5c:49a2]) by smtp.gmail.com with ESMTPSA id 12-20020a05600c230c00b003f90b9b2c31sm10469686wmo.28.2023.07.18.07.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 07:43:05 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Tue, 18 Jul 2023 15:43:00 +0100 Message-Id: <20230718144301.3612-2-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230718144301.3612-1-david.plowman@raspberrypi.com> References: <20230718144301.3612-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 1/2] libcamera: controls: Add controls for AEC/AGC flicker avoidance 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-Patchwork-Original-From: David Plowman via libcamera-devel From: David Plowman Reply-To: David Plowman Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Flicker is the term used to describe brightness banding or oscillation of images caused typically by artificial lighting driven by a 50 or 60Hz mains supply. We add three controls intended to be used by AEC/AGC algorithms: AeFlickerMode to enable flicker avoidance. AeFlickerPeriod to set the flicker period "manually". AeFlickerDetected to report any flicker that is currently detected. Signed-off-by: David Plowman Reviewed-by: Jacopo Mondi Reviewed-by: Umang Jain --- src/libcamera/control_ids.yaml | 90 +++++++++++++++++++++++++++------- 1 file changed, 73 insertions(+), 17 deletions(-) diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml index 056886e6..f2e542f4 100644 --- a/src/libcamera/control_ids.yaml +++ b/src/libcamera/control_ids.yaml @@ -156,6 +156,79 @@ controls: control of which features should be automatically adjusted shouldn't better be handled through a separate AE mode control. + - AeFlickerMode: + type: int32_t + description: | + Set the flicker mode, which determines whether, and how, the AGC/AEC + algorithm attempts to hide flicker effects caused by the duty cycle of + artificial lighting. + + Although implementation dependent, many algorithms for "flicker + avoidance" work by restricting this exposure time to integer multiples + of the cycle period, wherever possible. + + Implementations may not support all of the flicker modes listed below. + + By default the system will start in FlickerAuto mode if this is + supported, otherwise the flicker mode will be set to FlickerOff. + + enum: + - name: FlickerOff + value: 0 + description: No flicker avoidance is performed. + - name: FlickerManual + value: 1 + description: Manual flicker avoidance. + Suppress flicker effects caused by lighting running with a period + specified by the AeFlickerPeriod control. + \sa AeFlickerPeriod + - name: FlickerAuto + value: 2 + description: Automatic flicker period detection and avoidance. + The system will automatically determine the most likely value of + flicker period, and avoid flicker of this frequency. Once flicker + is being corrected, it is implementation dependent whether the + system is still able to detect a change in the flicker period. + \sa AeFlickerDetected + + - AeFlickerPeriod: + type: int32_t + description: Manual flicker period in microseconds. + This value sets the current flicker period to avoid. It is used when + AeFlickerMode is set to FlickerManual. + + To cancel 50Hz mains flicker, this should be set to 10000 (corresponding + to 100Hz), or 8333 (120Hz) for 60Hz mains. + + Setting the mode to FlickerManual when no AeFlickerPeriod has ever been + set means that no flicker cancellation occurs (until the value of this + control is updated). + + Switching to modes other than FlickerManual has no effect on the + value of the AeFlickerPeriod control. + + \sa AeFlickerMode + + - AeFlickerDetected: + type: int32_t + description: Flicker period detected in microseconds. + The value reported here indicates the currently detected flicker + period, or zero if no flicker at all is detected. + + When AeFlickerMode is set to FlickerAuto, there may be a period during + which the value reported here remains zero. Once a non-zero value is + reported, then this is the flicker period that has been detected and is + now being cancelled. + + In the case of 50Hz mains flicker, the value would be 10000 + (corresponding to 100Hz), or 8333 (120Hz) for 60Hz mains flicker. + + It is implementation dependent whether the system can continue to detect + flicker of different periods when another frequency is already being + cancelled. + + \sa AeFlickerMode + - Brightness: type: float description: | @@ -850,23 +923,6 @@ controls: value: 1 description: The lens shading map mode is available. - - SceneFlicker: - type: int32_t - draft: true - description: | - Control to report the detected scene light frequency. Currently - identical to ANDROID_STATISTICS_SCENE_FLICKER. - enum: - - name: SceneFickerOff - value: 0 - description: No flickering detected. - - name: SceneFicker50Hz - value: 1 - description: 50Hz flickering detected. - - name: SceneFicker60Hz - value: 2 - description: 60Hz flickering detected. - - PipelineDepth: type: int32_t draft: true