From patchwork Wed Mar 23 13:56:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15522 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 821AEC0F1B for ; Wed, 23 Mar 2022 13:56:26 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 21B4E61FBC; Wed, 23 Mar 2022 14:56:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648043786; bh=X62HXjRtuLhRG+xiOJG8feXQQi7KB3lw9f4CtrUGNP4=; 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=QmshO7cQDbn/WnypgWXhbH5RHv7nngQw8rgQ6scYp8Ebqmiva3Bc+5CnZtSjIb7pr 8U0eGF55VSAzyJygMMvbQuoSwZLyBORB5kKFuUjTicDMCLt9LtlABL4/ST23XSrG+D wNdMQVT+rPTyVuj/0qcmgaR6iZGXEtYlrMrflHepWcSVZ6RFacGmlCvWg0Qv/vIQY9 EoMHcwvmAuE1Q/ddbFDE29cHjreRjz/xnXnIj42xCrbDTUE/EefAexqJ9B2eGp8szB NpLKgL+Slfv+C586IuZoDbMmH+PT3lhaAgHU95Yx0m6UcoQ2lSVGP91qDAGITOOqQj VcTCgsDil0mfg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 697C1604D5 for ; Wed, 23 Mar 2022 14:56:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="arwI1GAS"; dkim-atps=neutral Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2094FFFD; Wed, 23 Mar 2022 14:56:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648043781; bh=X62HXjRtuLhRG+xiOJG8feXQQi7KB3lw9f4CtrUGNP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=arwI1GASzOWpF13S32ko989qBq9LV+2nEOvAW4l7vc+oq3h2uOPGEHrC54Tfy7BHB KK+JFNNreBHNBS7JJ4kjin773dpd/NiLoiTVITawVJIK8N/bWwOI4CRUXxW7Bg8Ner TOg3p7sIpn/RpS1k2keeo/uQwE6g4wQOecJi3TYY= To: libcamera devel Date: Wed, 23 Mar 2022 13:56:13 +0000 Message-Id: <20220323135614.865252-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220323135614.865252-1-kieran.bingham@ideasonboard.com> References: <20220323135614.865252-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 4/5] ipa: ipu3: af: Use Span for y_table_item_t 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 Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Convert the y_table_item_t to a Span and use that for iteration when estimating variance of the table. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/ipa/ipu3/algorithms/af.cpp | 34 +++++++++++++++++----------------- src/ipa/ipu3/algorithms/af.h | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp index 68e100fdc504..ff5e9fb5b3c5 100644 --- a/src/ipa/ipu3/algorithms/af.cpp +++ b/src/ipa/ipu3/algorithms/af.cpp @@ -336,29 +336,29 @@ void Af::afIgnoreFrameReset() * * \return The variance of the values in the data set \a y_item selected by \a isY1 */ -double Af::afEstimateVariance(const y_table_item_t *y_item, uint32_t len, - bool isY1) +double Af::afEstimateVariance(Span y_items, bool isY1) { - uint32_t z = 0; uint32_t total = 0; double mean; double var_sum = 0; - for (z = 0; z < len; z++) { + for (auto y : y_items) { if (isY1) - total += y_item[z].y1_avg; + total += y.y1_avg; else - total += y_item[z].y2_avg; + total += y.y2_avg; } - mean = total / len; - for (z = 0; z < len; z++) { + + mean = total / y_items.size(); + + for (auto y : y_items) { if (isY1) - var_sum += pow((y_item[z].y1_avg - mean), 2); + var_sum += pow((y.y1_avg - mean), 2); else - var_sum += pow((y_item[z].y2_avg - mean), 2); + var_sum += pow((y.y2_avg - mean), 2); } - return var_sum / static_cast(len); + return var_sum / static_cast(y_items.size()); } /** @@ -406,21 +406,21 @@ bool Af::afIsOutOfFocus(IPAContext context) */ void Af::process(IPAContext &context, const ipu3_uapi_stats_3a *stats) { - const y_table_item_t *y_item = reinterpret_cast(&stats->af_raw_buffer.y_table); - uint32_t afRawBufferLen; - /* Evaluate the AF buffer length */ - afRawBufferLen = context.configuration.af.afGrid.width * - context.configuration.af.afGrid.height; + uint32_t afRawBufferLen = context.configuration.af.afGrid.width * + context.configuration.af.afGrid.height; ASSERT(afRawBufferLen < IPU3_UAPI_AF_Y_TABLE_MAX_SIZE); + Span y_items(reinterpret_cast(&stats->af_raw_buffer.y_table), + afRawBufferLen); + /* * Calculate the mean and the variance of AF statistics for a given grid. * For coarse: y1 are used. * For fine: y2 results are used. */ - currentVariance_ = afEstimateVariance(y_item, afRawBufferLen, !coarseCompleted_); + currentVariance_ = afEstimateVariance(y_items, !coarseCompleted_); if (!context.frameContext.af.stable) { afCoarseScan(context); diff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h index 3b5758e868ea..b85cf94163ff 100644 --- a/src/ipa/ipu3/algorithms/af.h +++ b/src/ipa/ipu3/algorithms/af.h @@ -41,8 +41,8 @@ private: void afReset(IPAContext &context); bool afNeedIgnoreFrame(); void afIgnoreFrameReset(); - double afEstimateVariance(const y_table_item_t *y_item, uint32_t len, - bool isY1); + double afEstimateVariance(Span y_items, bool isY1); + bool afIsOutOfFocus(IPAContext context); /* VCM step configuration. It is the current setting of the VCM step. */