From patchwork Wed Jul 13 08:43:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Semkowicz X-Patchwork-Id: 16602 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 EE0C2BD1F1 for ; Wed, 13 Jul 2022 08:43:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AE0706331E; Wed, 13 Jul 2022 10:43:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657701820; 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=t94rEw0NGvvR/6ww987EXnunRV7v0jg1qUtagsuymKsF63FZr5fq4YHzWDDMPyO+S do8h2P0urrgNJriUKIBNggt70MPOCCzBUXSUmK0XdhzD9wp02H3C/z3egZtAcFLO2v QlndYbnUUAt7kZEyyHfuQIa6D5aqhtd3Zmiz2Bqs1FvjZJpNgAxHlXNvMqK02VvXzR tj83RpN/eOvUK6KWIRvELpylYzxftscM0xx2tLNAogplE5PjIUGZcT/RAq078YVgeP dhMOMgOIiaHKKfO0m+/QTJkyLWgeZ2ODqbqjWoAnB16ZVCxFMIV6IDRDDfiHxXAd7n ri7TODKXMJA7A== Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 238BA63317 for ; Wed, 13 Jul 2022 10:43:39 +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="vvt82O+L"; dkim-atps=neutral Received: by mail-wm1-x32b.google.com with SMTP id l68so6081686wml.3 for ; Wed, 13 Jul 2022 01:43:39 -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=vvt82O+Ldbf4Rubme4VYFzEDhrwdoywIilbXCVjttqW7l3bFOG9Vm7UGfgTkaW+Imi GgUyPpe5cSyLtMQXbxUkwnm1+wNXN4x9+tEBWbMi8LMt3JP/H6QkKfe9zmTDp5VsBN6/ IO3MZ0TAZNWFoYpKQyeIMRb3Ev+kz+FuqG07iLjsOv3dPgS5alViXr98LrKeD+531cbh wLNsBnSUcOkJ6HkBtAGHmkiWsmCJ9rhJ2L/Pu1CiQhTUXhoJPQTtI5MI0IBNyPsnClem 2ALBor2G2bPE91TkiJK9ry+7EYlJsCHJMBMnOWvBrKpXgU9Sv+vfTs+dQNKjeeGFwBgx 23ug== 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=Vg45KvbnmZD/vUShwA2/LsU59lv5KV1vsUPMq06jTiIno3lR5irotd0DPOebhJZugl HbqC7Z8O0+XJfH0Y4JJGRZhIQ633VaCLqYR6NkBORSHRJJkSmp0ktLWmardCkvAxkL3F ILtqzkS2XTOxuCYzpLu7w/gY+iVI8ORAvRku6xBscBS0iaiqOt+SschREvnYpULEUVLt n6IcVMIDN0nZ2w8hrPZH9Q0EPPWSnerJ+TdTUTgiyziYssXIQm8c+/cBDYIGDcoYYFO1 +cc1qFeMq5mGF1W6ka9a2tjfQWXvqAXcN+JaYuPgcJhOqb6QM8E6vft9MJ6+xuZkWn5R ZciA== X-Gm-Message-State: AJIora975i6QSBrAJG7sAwHA/oj0dTC+SEVUTqVQhLgEnhip80WTJksa oB7zM1a5nk9GYuUyXGkw/MUKGlv4cDYBCw== X-Google-Smtp-Source: AGRyM1s2kY5DTXOfYCst0RNoNZheBB6qwmiqItVrSoSYbIx+eBQmExVwfhhTEqRUhOpJ5qGuvisyYg== X-Received: by 2002:a05:600c:3d95:b0:3a2:e97b:f3ae with SMTP id bi21-20020a05600c3d9500b003a2e97bf3aemr8151749wmb.188.1657701818873; Wed, 13 Jul 2022 01:43:38 -0700 (PDT) Received: from localhost.localdomain (ip092042140082.rev.nessus.at. [92.42.140.82]) by smtp.gmail.com with ESMTPSA id bg32-20020a05600c3ca000b003a04d19dab3sm5667468wmb.3.2022.07.13.01.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 01:43:38 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Wed, 13 Jul 2022 10:43:10 +0200 Message-Id: <20220713084317.24268-5-dse@thaumatec.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220713084317.24268-1-dse@thaumatec.com> References: <20220713084317.24268-1-dse@thaumatec.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 04/11] 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);