From patchwork Tue Jul 25 12:56:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 18890 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 6EA09C324E for ; Tue, 25 Jul 2023 12:56:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 191AE628C6; Tue, 25 Jul 2023 14:56:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1690289810; bh=MHr/q2/XPNp28koWGsMujRqxQLVldKxL7/9CX6gIJIs=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=oPb0CgTdJDw9RVJY/UF4WLXGkKDm16DnjRrn4NQgLafddMlHNzwyTcbKD2XNGST+3 un/sYQQy84vBw/yb2ld/iVmAKXm2D3HYuO1GwWTN/ILBEETPkR8yfBcHtUrOJ35cl7 0+GOiLBw6lBCQ8E84MvRhvx/lKKwc4rjp+1C4s2EjvI7ihG/tmjhrjoZlsLZnyH6PD oeWLgVuAilCsVZ/7/r+5GJ9Km3Wpx1cPKN5xSr5QmdpoEmOgn4hTzqz0VyzfPVlTni +iCzTaCh4WE0+p4umfEs2Cowx2TmlHqGrSYK5Jdqvv6H4yDpYcZ1t9T9FjTCkBlAG1 6kX4MbSyGRD2w== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1F6B361E29 for ; Tue, 25 Jul 2023 14:56:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="RgihpP8j"; dkim-atps=neutral Received: from Monstersaurus.local (aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net [82.37.23.78]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 967ABA06; Tue, 25 Jul 2023 14:55:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1690289748; bh=MHr/q2/XPNp28koWGsMujRqxQLVldKxL7/9CX6gIJIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RgihpP8jIbTikn6nR2dCkdUez69l64RwLkaeEQnpQm836VWyumzPMFA1Cjm4lB6rz Kp/q/70CMyw8cXV1iGjnYtT+OEjzDi72cWUayRU+Wet56TueUSZkRJtYT932G0NK2j fegNGHpHTzBzpk2Ggg6XRNZEi4rm/4BXREC0SboY= To: libcamera devel Date: Tue, 25 Jul 2023 13:56:40 +0100 Message-Id: <20230725125641.1557350-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230725125641.1557350-1-kieran.bingham@ideasonboard.com> References: <20230725125641.1557350-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] py: gen-py-controls: Remove SceneFlicker workaround 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: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Cc: Vedant Paranjape Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The python bindings layer has to parse the libcamera controls to ensure that they are converted to suitable names for the python layer. Part of this strips out common prefixes from control names, however the SceneFlicker control would end up using an illegal name if processed in the same way as the other controls. The SceneFlicker control has now been removed as part of the introduction of the AeFlickerMode and AeFlickerPeriod controls. Remove the workaround in the python layer. Fixes: 6fdbf3f38c31 ("libcamera: controls: Add controls for AEC/AGC flicker avoidance") Signed-off-by: Kieran Bingham Reviewed-by: David Plowman Reviewed-by: Laurent Pinchart --- src/py/libcamera/gen-py-controls.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/py/libcamera/gen-py-controls.py b/src/py/libcamera/gen-py-controls.py index 99f3bbcf5b80..9948c41e42b1 100755 --- a/src/py/libcamera/gen-py-controls.py +++ b/src/py/libcamera/gen-py-controls.py @@ -48,9 +48,6 @@ def generate_py(controls, mode): # Adjustments for controls if name == 'LensShadingMapMode': prefix = 'LensShadingMapMode' - elif name == 'SceneFlicker': - # If we strip the prefix, we would get '50Hz', which is illegal name - prefix = '' else: prefix = find_common_prefix([e['name'] for e in enum]) else: