From patchwork Thu Apr 21 07:28:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kate Hsuan X-Patchwork-Id: 15694 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 1D3C1C0F1B for ; Thu, 21 Apr 2022 07:29:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C863B65645; Thu, 21 Apr 2022 09:29:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1650526161; bh=uThgyHjDnC+lEe99mYtFrOliYIAAEhRoIck9nWog638=; 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=05JZDwRrL1el8L7etcTsvCzuVA+0LKSzLAAFFlnMO6zHfYYh8PMOT+0evX29z8yQB /giy2LdYvYp9MqxeIi+H5vybEHSAhP2xY2YZ83f05sNn76k1OdkqsX9a9E4pRsZVYW IwrcQRHu9DmTzK/WWA0GUUzqfLvmeCOFqiskom38ajw6XJZ/sRgGSj73o8piiJ+Hr1 fcScjUUPMjm5ayPXi1DIOrMb9MzgQJ7iSCwk5ikVrezZVJx1DMG98IbeSSGh+jrian fACRtG8EsvgDdXkkzRWlvm1uccEAlbQVt8794LQiLTTTmDzuFni8e8fop3Suz9moDn MxZ26bEKTDKXw== Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4B96D604AD for ; Thu, 21 Apr 2022 09:29:20 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="U0KKiZvb"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650526159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yAiQvw5R+MG2sBMTBHOEpOULc3I1Ns2d+x8NgzRMtSA=; b=U0KKiZvbut9sLYUoVxXM8jZr0vTqaHjF89JVUYWjMFEJ6Gp2a4I37AdCS9Ijc6CT+7us+Q 5gT2vQimQQ34gp8jLQM3ZPS0lj5/NjVueregTnTuPbV3/ltwFAT2JgNv9jLm4FBLyZi4kh wgrWknpj2hogqNcsbzKw1yooBOP0j4g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-613-shDRrt0qM1mkJZgwJ9TmLA-1; Thu, 21 Apr 2022 03:29:18 -0400 X-MC-Unique: shDRrt0qM1mkJZgwJ9TmLA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 11B1180159B for ; Thu, 21 Apr 2022 07:29:18 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.194.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08C8BC3598E; Thu, 21 Apr 2022 07:29:15 +0000 (UTC) To: libcamera devel Date: Thu, 21 Apr 2022 15:28:48 +0800 Message-Id: <20220421072848.6752-5-hpa@redhat.com> In-Reply-To: <20220421072848.6752-1-hpa@redhat.com> References: <20220421072848.6752-1-hpa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hpa@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [libcamera-devel] [RFC PATCH v2 4/4] ipa: ipu3: af: Remove hardcoded maximum VCM steps 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: Kate Hsuan via libcamera-devel From: Kate Hsuan Reply-To: Kate Hsuan Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The hardcoded VCM step variable was removed and was replaced by the configInfo. Signed-off-by: Kate Hsuan --- src/ipa/ipu3/algorithms/af.cpp | 13 ++++--------- src/ipa/ipu3/algorithms/af.h | 2 ++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp index f700b01f..4faf0bd8 100644 --- a/src/ipa/ipu3/algorithms/af.cpp +++ b/src/ipa/ipu3/algorithms/af.cpp @@ -62,12 +62,6 @@ namespace ipa::ipu3::algorithms { LOG_DEFINE_CATEGORY(IPU3Af) -/** - * Maximum focus steps of the VCM control - * \todo should be obtained from the VCM driver - */ -static constexpr uint32_t kMaxFocusSteps = 1023; - /* Minimum focus step for searching appropriate focus */ static constexpr uint32_t kCoarseSearchStep = 30; static constexpr uint32_t kFineSearchStep = 1; @@ -179,7 +173,8 @@ int Af::configure(IPAContext &context, const IPAConfigInfo &configInfo) grid.y_start |= IPU3_UAPI_GRID_Y_START_EN; /* Initial max focus step */ - maxStep_ = kMaxFocusSteps; + maxStep_ = configInfo.sensorInfo.maxVcmSteps; + maxFocusSteps_ = configInfo.sensorInfo.maxVcmSteps; /* Initial frame ignore counter */ afIgnoreFrameReset(); @@ -217,7 +212,7 @@ void Af::afCoarseScan(IPAContext &context) context.frameContext.af.focus = focus_; previousVariance_ = 0; maxStep_ = std::clamp(focus_ + static_cast((focus_ * kFineRange)), - 0U, kMaxFocusSteps); + 0U, maxFocusSteps_); } } @@ -262,7 +257,7 @@ void Af::afReset(IPAContext &context) previousVariance_ = 0.0; coarseCompleted_ = false; fineCompleted_ = false; - maxStep_ = kMaxFocusSteps; + maxStep_ = maxFocusSteps_; } /** diff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h index b85cf941..a1cf561c 100644 --- a/src/ipa/ipu3/algorithms/af.h +++ b/src/ipa/ipu3/algorithms/af.h @@ -45,6 +45,8 @@ private: bool afIsOutOfFocus(IPAContext context); + /* Maximum VCM steps */ + uint32_t maxFocusSteps_; /* VCM step configuration. It is the current setting of the VCM step. */ uint32_t focus_; /* The best VCM step. It is a local optimum VCM step during scanning. */