From patchwork Tue Jan 31 13:46:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18228 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 CA0C7C323E for ; Tue, 31 Jan 2023 13:46:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 109E5625E4; Tue, 31 Jan 2023 14:46:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1675172813; bh=JN4gQ1MBFYa/8+ILfy4U82x+R4HVJcVm9NutWcPmol8=; 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=lOEVySZ2xrTueoMgCQz5uxarSaYMJJGPxjOqXj9Rk1Pe4YEuFuW6ld3ww8ALqaqrb ufvsHIjnMshVt6vxUzXpcw6GkElqi1fjwYf1FtKRbipVd0TKjx8e5PWk9nk6Qvi3J3 A4FTRyoUrCxpCyWuT0v/riHi4Gjzn34Jmlw3TYb5Dg5BibgwKrxvq+15q0updwapB5 qdM/H+tNnV1iM2PdXBzzdzWH5eHYCuAwWB/imGMwPURE+q2JeO9cY5DFtK3YsJR2Ra qc89COHXgwo0jPlIiiUxheA2VDUkXGjnT5elIXVHlUSNbHeYNS14U+cQzW7HoXUt3Q IN7cDM+FuBRCQ== Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E3A9625D0 for ; Tue, 31 Jan 2023 14:46:50 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Ie1Kx5tC"; dkim-atps=neutral Received: by mail-wr1-x42f.google.com with SMTP id q5so14294743wrv.0 for ; Tue, 31 Jan 2023 05:46:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L25f+/Pygp7MQMp/Xzzj481+r909qsH9nphy5s3SDT8=; b=Ie1Kx5tCb3AOTVD/k6OeI6GZwWmgnqekT8KN/SMHu+VVRv/XdW6IGZiEc+bwxhDzk+ mWBIVCRp0ZIr0+HvIzj+cXhhNJ73gwywin4Ezmejr/4/0ZUi0N6ThmNieTvgmY/POj4y 0pU6ZPYkildxCE4usDMtCGOB69k3MOw4gGrmPn0RTuFQAsHw/ONEsNmkWwVgESzp2Wo1 BtfiMYOte6ymaBRPL73R+rRLjdynQEuEuOtS9sANrLp0aErWPZd5Tj1Dq6Rt/c8W9w0k 4nahT7PDVrP3mhVrqPzR/yXUgQD2oas+UGotf56BzbQx59kZRcvotC/JmHznsLAnfKT4 HkXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L25f+/Pygp7MQMp/Xzzj481+r909qsH9nphy5s3SDT8=; b=bEdezsnmXuTylYw7Utzy/lIprv7+lel0f8a7LLk6de7quuouLcRpJrYYvz+3mhC7lq ErPg4ultriy+rEUk7u8T/GFrNAgwGBEC8BGUs8D2tqM3iqkSfxPG+gGpKyTh1/nrdDmv EWkrNrWR1Ad6l2IZdwlGpY7enTPL2q9YrKLWOwcMlg0vIeR9FMBGHEoSwJj5DZDiu31N bu0/Ctsws6m1DGtSnj/2s9gMbFdGO8qEVX6lg7c93qYKtTkK1ZcTeqLhGeV6AnQsTnMZ 7eRbbgLiDJkET/S5gYLM/lzk+OfwZs63hB0eAsiVYvBLMNGOO1LbjKNvJThvSnADtKsu Gkaw== X-Gm-Message-State: AO0yUKVwc9HkuAYwwLyEd2PicClbasLezTqtaN8gAY6hyK4b6axUM9zs G3GRxAovi7Os44dzIhixAkolkMSpCHQyw/zDPSz94A== X-Google-Smtp-Source: AK7set8ACA1hO8DJ/3dwtTlfIxFNpEGcvsvOfM5kIOHi8i1hHJ7ViTXSHC+TtbX8OaNBa9YvrKEynQ== X-Received: by 2002:adf:ed83:0:b0:28b:ca44:641f with SMTP id c3-20020adfed83000000b0028bca44641fmr2947622wro.30.1675172810258; Tue, 31 Jan 2023 05:46:50 -0800 (PST) Received: from localhost.localdomain ([193.209.96.36]) by smtp.gmail.com with ESMTPSA id z14-20020a5d4c8e000000b002bfc2d0eff0sm14683100wrs.47.2023.01.31.05.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 05:46:49 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Tue, 31 Jan 2023 13:46:46 +0000 Message-Id: <20230131134646.9868-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221213114836.15473-6-naush@raspberrypi.com> References: <20221213114836.15473-6-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] ipa: raspberrypi: Normalise region sums to 16-bits 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: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The VC4 ISP uses a pipeline bit-depth of 13-bits. The AGC algorithm needs to know this bit-depth when computing the Y value for the image. Instead of hardcoding the VC4 bit-depth in the AGC source code, normalise all region sums to 16-bits when filling the Statistics structure. AWB and ALSC are agnostic about pipeline depth, so do not need changing. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Kieran Bingham --- src/ipa/raspberrypi/controller/rpi/agc.cpp | 11 +++++------ src/ipa/raspberrypi/raspberrypi.cpp | 18 ++++++++++++------ src/ipa/raspberrypi/statistics.h | 6 ++++++ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp index 868c30f03d66..ea0c82b5c4c8 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp @@ -28,8 +28,6 @@ LOG_DEFINE_CATEGORY(RPiAgc) #define NAME "rpi.agc" -static constexpr unsigned int PipelineBits = 13; /* seems to be a 13-bit pipeline */ - int AgcMeteringMode::read(const libcamera::YamlObject ¶ms) { const YamlObject &yamlWeights = params["weights"]; @@ -586,6 +584,7 @@ void Agc::fetchAwbStatus(Metadata *imageMetadata) static double computeInitialY(StatisticsPtr &stats, AwbStatus const &awb, double weights[], double gain) { + constexpr unsigned int maxVal = 1 << Statistics::NormalisationFactorPow2; /* * Note how the calculation below means that equal weights give you * "average" metering (i.e. all pixels equally important). @@ -593,9 +592,9 @@ static double computeInitialY(StatisticsPtr &stats, AwbStatus const &awb, double rSum = 0, gSum = 0, bSum = 0, pixelSum = 0; for (unsigned int i = 0; i < stats->agcRegions.numRegions(); i++) { auto ®ion = stats->agcRegions.get(i); - double rAcc = std::min(region.val.rSum * gain, ((1 << PipelineBits) - 1) * region.counted); - double gAcc = std::min(region.val.gSum * gain, ((1 << PipelineBits) - 1) * region.counted); - double bAcc = std::min(region.val.bSum * gain, ((1 << PipelineBits) - 1) * region.counted); + double rAcc = std::min(region.val.rSum * gain, (maxVal - 1) * region.counted); + double gAcc = std::min(region.val.gSum * gain, (maxVal - 1) * region.counted); + double bAcc = std::min(region.val.bSum * gain, (maxVal - 1) * region.counted); rSum += rAcc * weights[i]; gSum += gAcc * weights[i]; bSum += bAcc * weights[i]; @@ -608,7 +607,7 @@ static double computeInitialY(StatisticsPtr &stats, AwbStatus const &awb, double ySum = rSum * awb.gainR * .299 + gSum * awb.gainG * .587 + bSum * awb.gainB * .114; - return ySum / pixelSum / (1 << PipelineBits); + return ySum / pixelSum / maxVal; } /* diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index cff079bbafb3..1cf7649c3303 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -1154,11 +1154,17 @@ RPiController::StatisticsPtr IPARPi::fillStatistics(bcm2835_isp_stats *stats) co /* RGB histograms are not used, so do not populate them. */ statistics->yHist = std::move(RPiController::Histogram(stats->hist[0].g_hist, NUM_HISTOGRAM_BINS)); + /* + * All region sums are based on a 13-bit pipeline bit-depth. Normalise + * this to 16-bits for the AGC/AWB/ALSC algorithms. + */ + constexpr unsigned int scale = Statistics::NormalisationFactorPow2 - 13; + statistics->awbRegions.init({ DEFAULT_AWB_REGIONS_X, DEFAULT_AWB_REGIONS_Y }); for (i = 0; i < statistics->awbRegions.numRegions(); i++) - statistics->awbRegions.set(i, { { stats->awb_stats[i].r_sum, - stats->awb_stats[i].g_sum, - stats->awb_stats[i].b_sum }, + statistics->awbRegions.set(i, { { stats->awb_stats[i].r_sum << scale, + stats->awb_stats[i].g_sum << scale, + stats->awb_stats[i].b_sum << scale }, stats->awb_stats[i].counted, stats->awb_stats[i].notcounted }); @@ -1168,9 +1174,9 @@ RPiController::StatisticsPtr IPARPi::fillStatistics(bcm2835_isp_stats *stats) co */ statistics->agcRegions.init(15); for (i = 0; i < statistics->agcRegions.numRegions(); i++) - statistics->agcRegions.set(i, { { stats->agc_stats[i].r_sum, - stats->agc_stats[i].g_sum, - stats->agc_stats[i].b_sum }, + statistics->agcRegions.set(i, { { stats->agc_stats[i].r_sum << scale, + stats->agc_stats[i].g_sum << scale, + stats->agc_stats[i].b_sum << scale }, stats->agc_stats[i].counted, stats->awb_stats[i].notcounted }); diff --git a/src/ipa/raspberrypi/statistics.h b/src/ipa/raspberrypi/statistics.h index affb7272c963..22a72c94a90d 100644 --- a/src/ipa/raspberrypi/statistics.h +++ b/src/ipa/raspberrypi/statistics.h @@ -30,6 +30,12 @@ using RgbyRegions = RegionStats; using FocusRegions = RegionStats; struct Statistics { + /* + * All histogram and region based statistics are scaled to a maximum + * value given by (1 << NormalisationFactorPow2) - 1. + */ + static constexpr unsigned int NormalisationFactorPow2 = 16; + /* * Positioning of the AGC statistics gathering in the pipeline: * Pre-WB correction or post-WB correction.