[{"id":37806,"web_url":"https://patchwork.libcamera.org/comment/37806/","msgid":"<75c0caf2-7a1b-43a9-b23d-71661e46e205@ideasonboard.com>","date":"2026-01-21T16:01:53","subject":"Re: [PATCH v3 04/14] libcamera: ipa: simple: Rename \"ccm\"\n\tidentifiers not specific to CCM","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"content":"2026. 01. 14. 12:30 keltezéssel, Milan Zamazal írta:\n> Let's rename the identifiers that are related to general colour\n> corrections applied by matrix operations, rather than directly to the\n> sensor colour correction matrix.\n> \n> Signed-off-by: Milan Zamazal \n> ---\n\nLooks ok to me.\n\nReviewed-by: Barnabás Pőcze \n\n\n> src/ipa/simple/algorithms/lut.cpp | 32 +++++++++++++++----------------\n> src/ipa/simple/algorithms/lut.h | 2 +-\n> 2 files changed, 17 insertions(+), 17 deletions(-)\n> \n> diff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\n> index c19b34482..5c4683fd8 100644\n> --- a/src/ipa/simple/algorithms/lut.cpp\n> +++ b/src/ipa/simple/algorithms/lut.cpp\n> @@ -1,6 +1,6 @@\n> /* SPDX-License-Identifier: LGPL-2.1-or-later */\n> /*\n> - * Copyright (C) 2024-2025, Red Hat Inc.\n> + * Copyright (C) 2024-2026, Red Hat Inc.\n> *\n> * Color lookup tables construction\n> */\n> @@ -89,7 +89,7 @@ void Lut::updateGammaTable(IPAContext &context)\n> \tcontext.activeState.gamma.contrastExp = contrastExp;\n> }\n> \n> -int16_t Lut::ccmValue(unsigned int i, float ccm) const\n> +int16_t Lut::matrixValue(unsigned int i, float ccm) const\n> {\n> \treturn std::round(i * ccm);\n> }\n> @@ -128,25 +128,25 @@ void Lut::prepare(IPAContext &context,\n> \t\t\tparams->blue[i] = gammaTable[static_cast(lutGains.b())];\n> \t\t}\n> \t} else if (context.activeState.matrixChanged || gammaUpdateNeeded) {\n> -\t\tMatrix gainCcm = { { gains.r(), 0, 0,\n> -\t\t\t\t\t\t 0, gains.g(), 0,\n> -\t\t\t\t\t\t 0, 0, gains.b() } };\n> -\t\tauto ccm = context.activeState.ccm * gainCcm;\n> +\t\tMatrix gainMatrix = { { gains.r(), 0, 0,\n> +\t\t\t\t\t\t 0, gains.g(), 0,\n> +\t\t\t\t\t\t 0, 0, gains.b() } };\n> +\t\tauto matrix = context.activeState.ccm * gainMatrix;\n> \t\tauto &red = params->redCcm;\n> \t\tauto &green = params->greenCcm;\n> \t\tauto &blue = params->blueCcm;\n> -\t\tparams->ccm = ccm;\n> +\t\tparams->ccm = matrix;\n> \t\tif (!context.gpuIspEnabled) {\n> \t\t\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n> -\t\t\t\tred[i].r = ccmValue(i, ccm[0][0]);\n> -\t\t\t\tred[i].g = ccmValue(i, ccm[1][0]);\n> -\t\t\t\tred[i].b = ccmValue(i, ccm[2][0]);\n> -\t\t\t\tgreen[i].r = ccmValue(i, ccm[0][1]);\n> -\t\t\t\tgreen[i].g = ccmValue(i, ccm[1][1]);\n> -\t\t\t\tgreen[i].b = ccmValue(i, ccm[2][1]);\n> -\t\t\t\tblue[i].r = ccmValue(i, ccm[0][2]);\n> -\t\t\t\tblue[i].g = ccmValue(i, ccm[1][2]);\n> -\t\t\t\tblue[i].b = ccmValue(i, ccm[2][2]);\n> +\t\t\t\tred[i].r = matrixValue(i, matrix[0][0]);\n> +\t\t\t\tred[i].g = matrixValue(i, matrix[1][0]);\n> +\t\t\t\tred[i].b = matrixValue(i, matrix[2][0]);\n> +\t\t\t\tgreen[i].r = matrixValue(i, matrix[0][1]);\n> +\t\t\t\tgreen[i].g = matrixValue(i, matrix[1][1]);\n> +\t\t\t\tgreen[i].b = matrixValue(i, matrix[2][1]);\n> +\t\t\t\tblue[i].r = matrixValue(i, matrix[0][2]);\n> +\t\t\t\tblue[i].g = matrixValue(i, matrix[1][2]);\n> +\t\t\t\tblue[i].b = matrixValue(i, matrix[2][2]);\n> \t\t\t\tparams->gammaLut[i] = gammaTable[i / div];\n> \t\t\t}\n> \t\t}\n> diff --git a/src/ipa/simple/algorithms/lut.h b/src/ipa/simple/algorithms/lut.h\n> index ba8b9021b..0eafd0695 100644\n> --- a/src/ipa/simple/algorithms/lut.h\n> +++ b/src/ipa/simple/algorithms/lut.h\n> @@ -38,7 +38,7 @@ public:\n> \n> private:\n> \tvoid updateGammaTable(IPAContext &context);\n> -\tint16_t ccmValue(unsigned int i, float ccm) const;\n> +\tint16_t matrixValue(unsigned int i, float ccm) const;\n> };\n> \n> } /* namespace ipa::soft::algorithms */","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8B240C3220\n\tfor ;\n\tWed, 21 Jan 2026 16:01:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2F98C61FCB;\n\tWed, 21 Jan 2026 17:01:59 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EA6E561FBB\n\tfor ;\n\tWed, 21 Jan 2026 17:01:56 +0100 (CET)","from [192.168.33.24] (185.221.143.114.nat.pool.zt.hu\n\t[185.221.143.114])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EE8A71C6;\n\tWed, 21 Jan 2026 17:01:24 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Ftr3zSiX\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769011285;\n\tbh=hyZHWnchA9cZ0vlMk7GdNw0VA/luFLm8wLAuR8HatS0=;\n\th=Date:Subject:To:Cc:References:From:In-Reply-To:From;\n\tb=Ftr3zSiXvxoywsoUJGd9XzPdtl2as6tOesx8wK+atfBu78/M2uz3h6aRnIcHebZlM\n\tryxRQBGX9Ly7oVg33HpC0ninKeKeXPXqFVAGr2jDrNMl0SNLe7CP3i++90sPbleGGH\n\tcoBDyju29bipdX12l3qJwRDJ8a87XotTxuG4vZ+4=","Message-ID":"<75c0caf2-7a1b-43a9-b23d-71661e46e205@ideasonboard.com>","Date":"Wed, 21 Jan 2026 17:01:53 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH v3 04/14] libcamera: ipa: simple: Rename \"ccm\"\n\tidentifiers not specific to CCM","To":"Milan Zamazal , libcamera-devel@lists.libcamera.org","Cc":"Kieran Bingham ","References":"<20260114113016.25162-1-mzamazal@redhat.com>\n\t<20260114113016.25162-5-mzamazal@redhat.com>","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Content-Language":"en-US, hu-HU","In-Reply-To":"<20260114113016.25162-5-mzamazal@redhat.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]