From patchwork Fri Mar 25 09:25:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15551 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 57671BD80A for ; Fri, 25 Mar 2022 09:26:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 934DE604E6; Fri, 25 Mar 2022 10:26:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648200362; bh=43NIJj+5hiFsqIBc/AOVO2guQQtSCWxiznrx5wLbua4=; 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=PBtnxHriowvaCA2pwJyBCNmmHbcGwQLKikUy6C5CA9ZNKhJirQvMq1i3bK5VhS+Zl ncCaFBHjXgj2fhs64DNFSYk3tif1+nK2cT0atENJXA0h0hMmJ4pGv/4nSYs1VkPmZv mGczGRN6HiqBdr0SfmaM1u8OoaGV73k8mlQgt5aDiFEHzMUOPJz/dhm2s2IY/3llgR hJps+9TxBWaRRhzCRqOtzzws9+TQbFJYF7gzykWYGFIwoEtle6lbp6DEcmTH/Va/MU NAXGbOZSC29wQKtpwzT5bJu8KEQV4IWAbs7Gi/a8YG55vK29uBfnLzaCVnAH4qQ8ZX souuD2fDnHwTQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C72AC60136 for ; Fri, 25 Mar 2022 10:26:00 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="r0gJsfpx"; 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 3DBBBA1B; Fri, 25 Mar 2022 10:26:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648200360; bh=43NIJj+5hiFsqIBc/AOVO2guQQtSCWxiznrx5wLbua4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r0gJsfpxNUyZmwTYjsAuVMAXAPyva5qbTU50KQ4qjBHTiRjybhfdKgkHBJufoljIN qgdUphjVVp2remuBM+qMCS3aeUlViXUD6SI0SAtkxwGUd0orXzvB9rBIvT+vi82yM4 3QjxdkrI/PaW8Hf2ClLVzdkbsb9+RriMHb+PKFI4= To: libcamera devel , Kate Hsuan , Jean-Michel Hautbois Date: Fri, 25 Mar 2022 09:25:51 +0000 Message-Id: <20220325092555.1799897-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> References: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/5] ipa: ipu3: af: Move constants to implementation 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" A selection of constants are imported from ChromiumOS. Move these out of the header, and simplify their documentation. Further more, add a direct reference to the location they were obtained from. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham Reviewed-by: Jean-Michel Hautbois --- src/ipa/ipu3/algorithms/af.cpp | 73 ++++++++++------------------------ src/ipa/ipu3/algorithms/af.h | 11 ----- 2 files changed, 22 insertions(+), 62 deletions(-) diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp index 0170a3728892..634d0f2e3176 100644 --- a/src/ipa/ipu3/algorithms/af.cpp +++ b/src/ipa/ipu3/algorithms/af.cpp @@ -29,59 +29,30 @@ * \file af.h */ -/** - * \var kAfMinGridWidth - * \brief the minimum width of AF grid. - * The minimum grid horizontal dimensions. - */ - -/** - * \var kAfMinGridHeight - * \brief the minimum height of AF grid. - * The minimum grid vertical dimensions. - */ - -/** - * \var kAfMaxGridWidth - * \brief the maximum width of AF grid. - * The maximum grid horizontal dimensions. - */ - -/** - * \var kAfMaxGridHeight - * \brief The maximum height of AF grid. - * The maximum grid vertical dimensions. - */ - -/** - * \var kAfMinGridBlockWidth - * \brief The minimum block size of the width. - * The minimum value of Log2 of the width of the grid cell. - */ - -/** - * \var kAfMinGridBlockHeight - * \brief The minimum block size of the height. - * The minimum value of Log2 of the height of the grid cell. - */ - -/** - * \def kAfMaxGridBlockWidth - * \brief The maximum block size of the width. - * The maximum value of Log2 of the width of the grid cell. - */ - -/** - * \var kAfMaxGridBlockHeight - * \brief The maximum block size of the height. - * The maximum value of Log2 of the height of the grid cell. +/* + * Static variables from ChromiumOS Intel Camera HAL and ia_imaging library: + * - https://chromium.googlesource.com/chromiumos/platform/arc-camera/+/master/hal/intel/psl/ipu3/statsConverter/ipu3-stats.h + * - https://chromium.googlesource.com/chromiumos/platform/camera/+/refs/heads/main/hal/intel/ipu3/include/ia_imaging/af_public.h */ -/** - * \var kAfDefaultHeightPerSlice - * \brief The default number of blocks in vertical axis per slice. - * The number of blocks in vertical axis per slice. - */ +/** The minimum horizontal grid dimension. */ +static constexpr uint8_t kAfMinGridWidth = 16; +/** The minimum vertical grid dimension. */ +static constexpr uint8_t kAfMinGridHeight = 16; +/** The maximum horizontal grid dimension. */ +static constexpr uint8_t kAfMaxGridWidth = 32; +/** The maximum vertical grid dimension. */ +static constexpr uint8_t kAfMaxGridHeight = 24; +/** The minimum value of Log2 of the width of the grid cell. */ +static constexpr uint16_t kAfMinGridBlockWidth = 4; +/** The minimum value of Log2 of the height of the grid cell. */ +static constexpr uint16_t kAfMinGridBlockHeight = 3; +/** The maximum value of Log2 of the width of the grid cell. */ +static constexpr uint16_t kAfMaxGridBlockWidth = 6; +/** The maximum value of Log2 of the height of the grid cell. */ +static constexpr uint16_t kAfMaxGridBlockHeight = 6; +/** The number of blocks in vertical axis per slice. */ +static constexpr uint16_t kAfDefaultHeightPerSlice = 2; namespace libcamera { diff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h index 13c7e0e877fd..906f2843dd49 100644 --- a/src/ipa/ipu3/algorithms/af.h +++ b/src/ipa/ipu3/algorithms/af.h @@ -15,17 +15,6 @@ #include "algorithm.h" -/* Static variables from repo of chromium */ -static constexpr uint8_t kAfMinGridWidth = 16; -static constexpr uint8_t kAfMinGridHeight = 16; -static constexpr uint8_t kAfMaxGridWidth = 32; -static constexpr uint8_t kAfMaxGridHeight = 24; -static constexpr uint16_t kAfMinGridBlockWidth = 4; -static constexpr uint16_t kAfMinGridBlockHeight = 3; -static constexpr uint16_t kAfMaxGridBlockWidth = 6; -static constexpr uint16_t kAfMaxGridBlockHeight = 6; -static constexpr uint16_t kAfDefaultHeightPerSlice = 2; - namespace libcamera { namespace ipa::ipu3::algorithms { From patchwork Fri Mar 25 09:25:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15552 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 6A7DEC3264 for ; Fri, 25 Mar 2022 09:26:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6B7D6604DC; Fri, 25 Mar 2022 10:26:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648200363; bh=8wOE0/7UvGUtiXd8jQkPblDSHtr9s1ZBKoFkM1e/ANU=; 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=hsuB6jXrp7V+sx75kgEVOohZ9G5PfpJkoDKh/FdrF+MHR9CI4eDmum4v6K3qun+qx +bfvqEFoJ2HTNfAwbbTEPTjVn7n2q8SR3Wo5HL//J2VZgDTsKviw10ZDBD8RUIzvhS DpUrVKgltOKsQMTxpPe/HiWgX6FXyAH4gtBDHnA8nf+62XTeJ1L3iNqn5aL19omrKp Vpq3lzO68Col+MKEz0ZrtZvQmWd34mXlXrMy3DDNdaPF8IZKB4iruNPOeRxXNfrjFC aUbikPbcEx1A88F0dOKqD55+wmMadWgzBD4+YhuDL8LvRzGcfW9pH9Bd5yWD2C/ah3 89fMaCVsEQQsQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 041D7604C5 for ; Fri, 25 Mar 2022 10:26:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="v7jaUKmz"; 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 88B92DFE; Fri, 25 Mar 2022 10:26:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648200360; bh=8wOE0/7UvGUtiXd8jQkPblDSHtr9s1ZBKoFkM1e/ANU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v7jaUKmzOKVnJ31/yDOJUS2gVsaZTwy/0+puqbVqFqqMhiNnw2jy5dN6Gpk/lihgv Mu9au1e2UrWVrQsyrycgRzapEeC9q3W6a6fSx36U4EjjLSHecu8jkCaulNgjnfENOP r4tN4gI2znzZuCuft6/f+mtNBKW2ddXgNazoO1/0= To: libcamera devel , Kate Hsuan , Jean-Michel Hautbois Date: Fri, 25 Mar 2022 09:25:52 +0000 Message-Id: <20220325092555.1799897-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> References: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/5] ipa: ipu3: af: Use geometry classes to perform grid centering 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" Use our geometry classes for Rectangle, Size and Point to identify the region of interest for the autofocus, and center it on the BDS output. This will facilitate custom ROI being passed in through controls at a later time. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham Reviewed-by: Jean-Michel Hautbois --- src/ipa/ipu3/algorithms/af.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp index 634d0f2e3176..4476857fa772 100644 --- a/src/ipa/ipu3/algorithms/af.cpp +++ b/src/ipa/ipu3/algorithms/af.cpp @@ -141,16 +141,23 @@ int Af::configure(IPAContext &context, const IPAConfigInfo &configInfo) grid.block_height_log2 = kAfMinGridBlockHeight; grid.height_per_slice = kAfDefaultHeightPerSlice; - /* x_start and y start are default to BDS center */ - grid.x_start = (configInfo.bdsOutputSize.width / 2) - - (((grid.width << grid.block_width_log2) / 2)); - grid.y_start = (configInfo.bdsOutputSize.height / 2) - - (((grid.height << grid.block_height_log2) / 2)); + /* Position the AF grid in the center of the BDS output. */ + Rectangle bds(configInfo.bdsOutputSize); + Size gridSize(grid.width << grid.block_width_log2, + grid.height << grid.block_height_log2); + + /* + * \todo - Support request metadata + * - Set the ROI based on any input controls in the request + * - Return the AF ROI as metadata in the Request + */ + Rectangle roi = gridSize.centeredTo(bds.center()); + Point start = roi.topLeft(); /* x_start and y_start should be even */ - grid.x_start = (grid.x_start / 2) * 2; - grid.y_start = (grid.y_start / 2) * 2; - grid.y_start = grid.y_start | IPU3_UAPI_GRID_Y_START_EN; + grid.x_start = utils::alignDown(start.x, 2); + grid.y_start = utils::alignDown(start.y, 2); + grid.y_start |= IPU3_UAPI_GRID_Y_START_EN; /* Initial max focus step */ maxStep_ = kMaxFocusSteps; From patchwork Fri Mar 25 09:25:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15553 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 11876BD80A for ; Fri, 25 Mar 2022 09:26:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 63DB3604DB; Fri, 25 Mar 2022 10:26:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648200364; bh=PWGZDJJWtHg1tUvVeAnqITvOLIK6XnKsFMOkDhxIta8=; 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=tuNWjt2U1HI186IwUw9h0eZ+9tSGr+xml0a2xK9gr0E1coGwUnF3LXEoOT8t89aig E+2AFRl/UtWwGonB0bX1krXpUzGS9IQ82y8AkBrVDoERwsfGCGcbfRqcBOt1LZu74j uhE0AjgFgF1wGoxDutsGnLkzblXTzbXGQWwajiTREfgoVvUX7siAzd8qsLpGiG4qXS sKVvqwTefhYz60l6YJMejQrEmrJpYNpToFnXOmcCTRjNHx6AxyKPAnJgevQX7UkkzH AyWHI8bcmrV8Dl2geRbNgzg1SagWFdNPYAL5UNA428kMdG6uD5wnFbdghkakaP46cM y8SobU+H0duWQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 45317604D5 for ; Fri, 25 Mar 2022 10:26:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="RU/i1nh7"; 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 D2097E0D; Fri, 25 Mar 2022 10:26:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648200361; bh=PWGZDJJWtHg1tUvVeAnqITvOLIK6XnKsFMOkDhxIta8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RU/i1nh7EvF8vqxpxXcPCBrfC1kN/Ike9MJahrKN4TqIJPMJglr/OhSLUuqpdOe/4 aRNsqoGoI05yaxlUZgBfY2URb2R200EIWQXS/gKLu4eSFgV/SxL8NdawbIPPRRcd+6 p78PK2oxcKEovFe98+6tJ6Q2zvSbgTTuLE8W4vDc= To: libcamera devel , Kate Hsuan , Jean-Michel Hautbois Date: Fri, 25 Mar 2022 09:25:53 +0000 Message-Id: <20220325092555.1799897-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> References: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/5] ipa: ipu3: af: Remove redundant memcpy 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" The af statistics can be accessed directly from the mapped buffer. Remove the redundant memcpy, and simplify the call to afEstimateVariance(). Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham Reviewed-by: Jean-Michel Hautbois --- - Fix ASSERT src/ipa/ipu3/algorithms/af.cpp | 12 ++++-------- src/ipa/ipu3/algorithms/af.h | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp index 4476857fa772..6893a15fdc07 100644 --- a/src/ipa/ipu3/algorithms/af.cpp +++ b/src/ipa/ipu3/algorithms/af.cpp @@ -335,7 +335,7 @@ void Af::afIgnoreFrameReset() * * \return The variance of the values in the data set \a y_item selected by \a isY1 */ -double Af::afEstimateVariance(y_table_item_t *y_item, uint32_t len, +double Af::afEstimateVariance(const y_table_item_t *y_item, uint32_t len, bool isY1) { uint32_t z = 0; @@ -405,25 +405,21 @@ bool Af::afIsOutOfFocus(IPAContext context) */ void Af::process(IPAContext &context, const ipu3_uapi_stats_3a *stats) { - y_table_item_t y_item[IPU3_UAPI_AF_Y_TABLE_MAX_SIZE / sizeof(y_table_item_t)]; + 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; - memcpy(y_item, stats->af_raw_buffer.y_table, - afRawBufferLen * sizeof(y_table_item_t)); + ASSERT(afRawBufferLen < IPU3_UAPI_AF_Y_TABLE_MAX_SIZE); /* * Calculate the mean and the variance of AF statistics for a given grid. * For coarse: y1 are used. * For fine: y2 results are used. */ - if (coarseCompleted_) - currentVariance_ = afEstimateVariance(y_item, afRawBufferLen, false); - else - currentVariance_ = afEstimateVariance(y_item, afRawBufferLen, true); + currentVariance_ = afEstimateVariance(y_item, afRawBufferLen, !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 906f2843dd49..3b5758e868ea 100644 --- a/src/ipa/ipu3/algorithms/af.h +++ b/src/ipa/ipu3/algorithms/af.h @@ -41,7 +41,7 @@ private: void afReset(IPAContext &context); bool afNeedIgnoreFrame(); void afIgnoreFrameReset(); - double afEstimateVariance(y_table_item_t *y_item, uint32_t len, + double afEstimateVariance(const y_table_item_t *y_item, uint32_t len, bool isY1); bool afIsOutOfFocus(IPAContext context); From patchwork Fri Mar 25 09:25:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15554 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 79423C3265 for ; Fri, 25 Mar 2022 09:26:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4F200604EA; Fri, 25 Mar 2022 10:26:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648200365; bh=ovvmB/xUUnlsheOFLNWFFfwAF2vEsqOHGr0LJiKnFlM=; 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=n3TIcAp4PK1q2y6+rFridtug21VDGuYOiuKsrLnW7ij9vdrDZdaokawxxSRaBuXAX 2mNS4a5g4b9LcLPJsoQEuyVOE5VB6UcBT8x4pDeoByz8GJD8AOYLBKZ3Mu6Un3Fb8F ckWjy2g1A6UhclSEbef6zY4tvObhT9kJMeBhRst0YpPG3pOKJOfc57jkgEsS+qyR/D McM26XcAu+DzZ2w3pUVOkLqRuxuKf6NQlHwSU3AU1OB7cVdRDoy0EcL9nOC2tE1Gkt sPM6NRFYYuXWrohJ6dP09KbKKBEuNc3uZKYBlA2O1JdRV6fKk38xdBputkvC+20dUl bcjjUfQ1Jy3fQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8B7EB604D5 for ; Fri, 25 Mar 2022 10:26:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="G+Y8aF16"; 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 2C82AE15; Fri, 25 Mar 2022 10:26:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648200361; bh=ovvmB/xUUnlsheOFLNWFFfwAF2vEsqOHGr0LJiKnFlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G+Y8aF16pVZClb1KsVkSOHDaEepOyZXgnr4XR2RXydI8eHI07Rce8/A0itrG7XRF2 hS9rZgiP9ujMpq5MeM90A20jSSdmqcEjll8oeR+GRX7dbdW6LXae+5XkCBvH44pqqe JmyzX+u+rsbKJQQ+zOLHdIm5z46yTGPlQYtOneR4= To: libcamera devel , Kate Hsuan , Jean-Michel Hautbois Date: Fri, 25 Mar 2022 09:25:54 +0000 Message-Id: <20220325092555.1799897-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> References: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 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 Reviewed-by: Jean-Michel Hautbois --- v3: - Remove parentheses and casting in afEstimateVariance 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 6893a15fdc07..c0f2d34368cb 100644 --- a/src/ipa/ipu3/algorithms/af.cpp +++ b/src/ipa/ipu3/algorithms/af.cpp @@ -335,29 +335,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 / y_items.size(); } /** @@ -405,21 +405,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. */ From patchwork Fri Mar 25 09:25:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15555 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 80495C3264 for ; Fri, 25 Mar 2022 09:26:07 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 34B18604DA; Fri, 25 Mar 2022 10:26:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1648200367; bh=M1ZcY7OhxCoMapUJ81i5L9ddTveG40LiKFBBuN8qkIc=; 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=T60q8uQqkwNABSi9x4xhvFB30UYFDSvZ++rC65Z7lBumqdHFwEDUAKrnZoPW8gAr7 CJeuR2Mzv8KYYbT2o8J+IehMZbd7FfTZ0dv/VPTVbOwmTWLY/CXiJzZDn76dwIRnfQ cU723Uv4hG7dEjj7BImA0hlEsi9WhAd9gw67uJ03ynTEjR84P2XSd/uQ1X/SEbngGZ afyFFVS8iPn+fJwqfuas3IGotsB5eOOwCNWMUdWexFgnF2pGhQbBIVIdE5JbmnGgaV ro76SO/3bhW4Gf38EYXcWUj/eqDOPkBRynwKnV0GgDxmGBq2f9pI0Y5a5CigDk4UPP V5Hr3WIh7hbdA== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D8C62604E8 for ; Fri, 25 Mar 2022 10:26:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="PAakxMqA"; 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 75D66E1F; Fri, 25 Mar 2022 10:26:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1648200361; bh=M1ZcY7OhxCoMapUJ81i5L9ddTveG40LiKFBBuN8qkIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PAakxMqA25BoHU/gLk+4sPyFf4rI8UAKNiBF7TsCpIfk1YSZnyf+7dM4yWl5Fwdmq WxoQVH4xLLDqnmKE0lE28QedZrFwpO5d8Os65u5uxpbg5Ut4EzmPP9SlcpCssoqXV1 bR5ENA4cwMOjg6djaJ/c7qOm22VIV5OJqaOuj98A= To: libcamera devel , Kate Hsuan , Jean-Michel Hautbois Date: Fri, 25 Mar 2022 09:25:55 +0000 Message-Id: <20220325092555.1799897-6-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> References: <20220325092555.1799897-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 5/5] ipa: ipu3: af: Simplify accumulations of y_items 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" Simplify the accumulation of the total and variance with a ternary operator. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart Reviewed-by: Jean-Michel Hautbois --- src/ipa/ipu3/algorithms/af.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp index c0f2d34368cb..6c25d02ec7f0 100644 --- a/src/ipa/ipu3/algorithms/af.cpp +++ b/src/ipa/ipu3/algorithms/af.cpp @@ -341,20 +341,14 @@ double Af::afEstimateVariance(Span y_items, bool isY1) double mean; double var_sum = 0; - for (auto y : y_items) { - if (isY1) - total += y.y1_avg; - else - total += y.y2_avg; - } + for (auto y : y_items) + total += isY1 ? y.y1_avg : y.y2_avg; mean = total / y_items.size(); for (auto y : y_items) { - if (isY1) - var_sum += pow(y.y1_avg - mean, 2); - else - var_sum += pow(y.y2_avg - mean, 2); + double avg = isY1 ? y.y1_avg : y.y2_avg; + var_sum += pow(avg - mean, 2); } return var_sum / y_items.size();