From patchwork Thu Nov 27 02:37:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 25261 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 23785C32DE for ; Thu, 27 Nov 2025 02:38:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 97EFF60C6F; Thu, 27 Nov 2025 03:38:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="eLStOLLh"; dkim-atps=neutral Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AB18860AC5 for ; Thu, 27 Nov 2025 03:38:33 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-477a219dbcaso2595435e9.3 for ; Wed, 26 Nov 2025 18:38:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764211113; x=1764815913; darn=lists.libcamera.org; 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=24wXGFYfJlCqjSrTdSPnfcrWmHqpLPl1rwQ64/Nr/cU=; b=eLStOLLhjBRy6rS2yX//f/fQJqg3luyj8d27ELRhQ4n5su0WRVKvhowF7J661XWSXM S8LMINNPW7hrUTbam9d1jxF25jHC5B+lTwwVhv6cArWN+/88OodRCcKrr8CDOwWI62/i UojWkAfeJtHGSFKverFSvfbU2g2uWPmRIaHWWRe8qwS5zi5UNn7w9mHVLXYKjNJs7vok RLCmuU7lXvzaZ73Us09mQ4X6ywrA6PUHCz/i5M+zKgwJupYY8kdkIxW74tdMihvQenvt PbStImDQ7XfQgJirMTP7mIaw8dui/IREmRXgqcbNTUPhlbf3aqs7K3aWGWUcgUDbvJcY CEfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764211113; x=1764815913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=24wXGFYfJlCqjSrTdSPnfcrWmHqpLPl1rwQ64/Nr/cU=; b=lMRvA6+kUSmf49ttEpJQ7W4RulGoOAYxe5AB6lgYXKw4lvu3giMucPrOyb1586RGZE 9NsdOSaHBfepyNa6RujhPaCe8YL0Li1fsnwyjRGpIr4hhbqxvKmNJ/IdkZJPuvxkvmpm yIhkKW2NLNu3Qs46FG5wyA6axLWLhz+HernoNFR9VcH9U9xCbT1N2NU+ehP2iZxp/en3 UBUKk39l/WBrxrNEvrjkacCAIUw+5rfHiSkHFNbIiOo19ewJwqGY2bOaoSfglQNYePIn wuJHkmaYg/ubZCRgYykOMFwIpznlJkKufKROJNpuewH5mJWVcAknZfT1m1KXexYqWnPf 4KQA== X-Gm-Message-State: AOJu0Yy1+7dwIGffMnU0PXiK0Bk1efvMdtN8H6nLIkxe1XYtqAc1S7FI +WvnFXuyoFHJm0twicuH/3XfM46/dF1Ff2pYbU5R7pQQkvrWcmMkHJpBoU+XCFaql6sBT65f+6M 7zEbQJdk= X-Gm-Gg: ASbGncvdvuRf39e50okUAchnb8OKEa115L5YPUrEXFt07JSE4loPrdh1TNjgckJJ9CX F5WP7layFXyXaERDMK/NZI2daheGKeAtMvUbtPxcejtGfMB3voj7V1hmDqcWqsVODixIMRqC+XN ffl97E/kVMTzbOj9+yPw+1qSoSk5o83rVhoYatlIAQGFYf2wN96FhUoYPn21kXjdTzd0v5LmxJ8 RNskvYJohuBBRNaUf8hDGQc9hdTUpxBmgp99xiUEnm8q7XtJSu+gPdmkjvV1zsZXScpj7iduJ7f zJ5u+4VIDLv7uDxvgPWguARFvhxC9em41XWQCBK6JfAf3eqMBnNbSQLiDD9uNTmMpSey9Cr08lw D6Wbwr1y8yA+zOU+otXAyyGjIa4Uw4P9ENMzGgyCiKk3UHj4yKulwk3QczVxf568llzqdqtpvb8 dyjvgzTckO1p4bWhK/dLFblQXxtwcFy61dpd9HSLPi567z6WMy5sEKio31Qbfm8O6XLIo= X-Google-Smtp-Source: AGHT+IGZ4j/tpVqxp8xe6nXiI8C7jsbS/ubjuR2ZPCWLAO9dJIaMM+yCcFxv1dxMlnfVsWXedGBTog== X-Received: by 2002:a05:600c:474b:b0:46e:35a0:3587 with SMTP id 5b1f17b1804b1-477c01ee377mr215704155e9.27.1764211113012; Wed, 26 Nov 2025 18:38:33 -0800 (PST) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4790552c3c9sm58186345e9.0.2025.11.26.18.38.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 18:38:32 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue Subject: [PATCH v5 24/24] libcamera: software_isp: lut: Skip calculation lookup tables if gpuIspEnabled is true. Date: Thu, 27 Nov 2025 02:37:39 +0000 Message-ID: <20251127023739.179652-25-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251127023739.179652-1-bryan.odonoghue@linaro.org> References: <20251127023739.179652-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" On my reference platform Qualcomm RB5 sm8520 the qcam application CPU occupancy drops from ~100% to about 95% of a single core so this one change sheds aprox 5% CPU usage. Signed-off-by: Bryan O'Donoghue --- src/ipa/simple/algorithms/lut.cpp | 70 ++++++++++++++++--------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp index 7f223e812..618219b17 100644 --- a/src/ipa/simple/algorithms/lut.cpp +++ b/src/ipa/simple/algorithms/lut.cpp @@ -56,32 +56,34 @@ void Lut::queueRequest(typename Module::Context &context, void Lut::updateGammaTable(IPAContext &context) { - auto &gammaTable = context.activeState.gamma.gammaTable; const auto blackLevel = context.activeState.blc.level; - const unsigned int blackIndex = blackLevel * gammaTable.size() / 256; const auto contrast = context.activeState.knobs.contrast.value_or(1.0); - const float divisor = gammaTable.size() - blackIndex - 1.0; - for (unsigned int i = blackIndex; i < gammaTable.size(); i++) { - double normalized = (i - blackIndex) / divisor; - /* Convert 0..2 to 0..infinity; avoid actual inifinity at tan(pi/2) */ - double contrastExp = tan(std::clamp(contrast * M_PI_4, 0.0, M_PI_2 - 0.00001)); - /* Apply simple S-curve */ - if (normalized < 0.5) - normalized = 0.5 * std::pow(normalized / 0.5, contrastExp); - else - normalized = 1.0 - 0.5 * std::pow((1.0 - normalized) / 0.5, contrastExp); - gammaTable[i] = UINT8_MAX * - std::pow(normalized, context.configuration.gamma); + if (!context.gpuIspEnabled) { + auto &gammaTable = context.activeState.gamma.gammaTable; + const unsigned int blackIndex = blackLevel * gammaTable.size() / 256; + const float divisor = gammaTable.size() - blackIndex - 1.0; + for (unsigned int i = blackIndex; i < gammaTable.size(); i++) { + double normalized = (i - blackIndex) / divisor; + /* Convert 0..2 to 0..infinity; avoid actual inifinity at tan(pi/2) */ + double contrastExp = tan(std::clamp(contrast * M_PI_4, 0.0, M_PI_2 - 0.00001)); + /* Apply simple S-curve */ + if (normalized < 0.5) + normalized = 0.5 * std::pow(normalized / 0.5, contrastExp); + else + normalized = 1.0 - 0.5 * std::pow((1.0 - normalized) / 0.5, contrastExp); + gammaTable[i] = UINT8_MAX * + std::pow(normalized, context.configuration.gamma); + } + /* + * Due to CCM operations, the table lookup may reach indices below the black + * level. Let's set the table values below black level to the minimum + * non-black value to prevent problems when the minimum value is + * significantly non-zero (for example, when the image should be all grey). + */ + std::fill(gammaTable.begin(), gammaTable.begin() + blackIndex, + gammaTable[blackIndex]); } - /* - * Due to CCM operations, the table lookup may reach indices below the black - * level. Let's set the table values below black level to the minimum - * non-black value to prevent problems when the minimum value is - * significantly non-zero (for example, when the image should be all grey). - */ - std::fill(gammaTable.begin(), gammaTable.begin() + blackIndex, - gammaTable[blackIndex]); context.activeState.gamma.blackLevel = blackLevel; context.activeState.gamma.contrast = contrast; @@ -134,17 +136,19 @@ void Lut::prepare(IPAContext &context, auto &green = params->greenCcm; auto &blue = params->blueCcm; params->ccm = ccm; - for (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) { - red[i].r = ccmValue(i, ccm[0][0]); - red[i].g = ccmValue(i, ccm[1][0]); - red[i].b = ccmValue(i, ccm[2][0]); - green[i].r = ccmValue(i, ccm[0][1]); - green[i].g = ccmValue(i, ccm[1][1]); - green[i].b = ccmValue(i, ccm[2][1]); - blue[i].r = ccmValue(i, ccm[0][2]); - blue[i].g = ccmValue(i, ccm[1][2]); - blue[i].b = ccmValue(i, ccm[2][2]); - params->gammaLut[i] = gammaTable[i / div]; + if (!context.gpuIspEnabled) { + for (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) { + red[i].r = ccmValue(i, ccm[0][0]); + red[i].g = ccmValue(i, ccm[1][0]); + red[i].b = ccmValue(i, ccm[2][0]); + green[i].r = ccmValue(i, ccm[0][1]); + green[i].g = ccmValue(i, ccm[1][1]); + green[i].b = ccmValue(i, ccm[2][1]); + blue[i].r = ccmValue(i, ccm[0][2]); + blue[i].g = ccmValue(i, ccm[1][2]); + blue[i].b = ccmValue(i, ccm[2][2]); + params->gammaLut[i] = gammaTable[i / div]; + } } }