From patchwork Thu Jun 30 14:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Semkowicz X-Patchwork-Id: 16486 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 245EDBE173 for ; Thu, 30 Jun 2022 14:36:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C915C6565B; Thu, 30 Jun 2022 16:35:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1656599759; bh=a02j7m+LCJXnGBRYohDsOE13qJPexul5dyO/pjASgNs=; 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=GjE28zlJgP7TxexJo4/5CqG0L0myt7jAZ9oJ7v6BFKQipWf1LKTg3t6LwiwDzyXlk oNq8XhflQ4jmcfsEqV7q6ZgSv3lGgyotpZ+nd/KdBfV5zTkDS4yXxN7qdE6chBb2aJ OJ7oN4m+KX0ZAZb1+jtbATdYb5oZpqMfASOB8X8IBGfsHFuhjHrgpsmJcuZtwaKmlh HAsxXKhRTn1O+EOXLEH9aPRzjC9TLdg3oiV6/HK/CJoVl/aWinFXW6m3AEo2ZtqQxL QI9vs2Uf1dyqq6FKCquH79KCmlB395HYnvSS6/X73I9/JYiCAOGj4nc2otGvDpvI+x LoTwZjwxkA9jg== Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E61D865651 for ; Thu, 30 Jun 2022 16:35:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=thaumatec-com.20210112.gappssmtp.com header.i=@thaumatec-com.20210112.gappssmtp.com header.b="xLfjPOF8"; dkim-atps=neutral Received: by mail-wm1-x334.google.com with SMTP id be14-20020a05600c1e8e00b003a04a458c54so1804509wmb.3 for ; Thu, 30 Jun 2022 07:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thaumatec-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JpO4KM67IDVW3tNGmALv7h4/iatJGTjwtytTMopFnkA=; b=xLfjPOF8MnILcT3w556LpyJw3UVpxSRaGPPkl5oSjVun7DZRoPxFDNta61KI1TMIJh sPqJs2qlk6S07sXogIgYvMbQvdJm+RGEyEGuTJOd83VNN5ciVfId/wyet6m6YhTi169S XPLQvmaBVXSNWHep4i82nD2ynL3EcmO7vlpeAuyJxeFeocbmJCY6vMMhu1N/eMVMcQWx 6SRJ9rCzvCk/1sAdR5cbhf45seIB5Z2UWNPCVdMtO9TNgMbB7dpjD/8IIt5TrNp308Tq xCWq8BDS3cmf56E0gBApykb3fWKWlBkDxCJaN4/fgcQ6KlummvjVSMtw8LZ0GDb2GawU C1ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JpO4KM67IDVW3tNGmALv7h4/iatJGTjwtytTMopFnkA=; b=XBnCLsZxktP7AXIEf49V4Z13PhbEeHuwwel8ZREPBsOxUMs0EkI9bGOHcYj2GgV3VK 9GUr744ZmqUftL38LFF7F1ZE4Coc1shnqnEDO71h2JvdhblnYDd+2bzeAHBp9ptdBg1G pgoJ3OmCo38z5X3//Y+N5b+DWMkPy29CwYMENTSyXUIW++PvUzpGUsOc+TDnv3eAMzx5 p0NEFiDTMNM2ZaEU5XKAHcOlKqds1ws2FFKMSYoaAjFxLHCotQC2TnvWqVJZMEhsPu6S Ff21p9JwEgHcT26KBclNJRRw6X71bHbsKIDSlYo2W/H82fEqkMCOluzkg/X4rZrIKkEG h3aA== X-Gm-Message-State: AJIora+6VYJUF8iUGQl92UXVHANsY/dknt4xdP06MFC+j5jy7Pp2Ug5I dqGijpXcB1BzD4X0LDHdC70aYWl4EfT2hw== X-Google-Smtp-Source: AGRyM1tGT9hQWX7iz39420v0oBkgyQxOdG1ybSbzl86sJ1tpLs9J3GzUoEr0iz8tT9LHP2S5ehh4pQ== X-Received: by 2002:a05:600c:34c9:b0:3a0:5072:9abe with SMTP id d9-20020a05600c34c900b003a050729abemr10244078wmq.8.1656599757689; Thu, 30 Jun 2022 07:35:57 -0700 (PDT) Received: from localhost.localdomain (ip092042140082.rev.nessus.at. [92.42.140.82]) by smtp.gmail.com with ESMTPSA id r5-20020a05600c320500b0039db500714fsm6405945wmp.6.2022.06.30.07.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 07:35:57 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 30 Jun 2022 16:35:39 +0200 Message-Id: <20220630143543.39599-5-dse@thaumatec.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220630143543.39599-1-dse@thaumatec.com> References: <20220630143543.39599-1-dse@thaumatec.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/8] pipeline: rkisp1: Add basic AF controls to the supported controls list 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: Daniel Semkowicz via libcamera-devel From: Daniel Semkowicz Reply-To: Daniel Semkowicz Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This will expose the AF controls and will allow controlling them using the top level API. Signed-off-by: Daniel Semkowicz --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 7ee80192..99d66b1d 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -958,10 +958,12 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor) std::unique_ptr data = std::make_unique(this, &mainPath_, &selfPath_); - ControlInfoMap::Map ctrls; - ctrls.emplace(std::piecewise_construct, - std::forward_as_tuple(&controls::AeEnable), - std::forward_as_tuple(false, true)); + ControlInfoMap::Map ctrls({ + { &controls::AeEnable, ControlInfo(false, true) }, + { &controls::AfMode, ControlInfo(controls::AfModeValues) }, + { &controls::AfTrigger, ControlInfo(controls::AfTriggerValues) }, + { &controls::AfPause, ControlInfo(controls::AfPauseValues) } + }); data->controlInfo_ = ControlInfoMap(std::move(ctrls), controls::controls);