{"id":22731,"url":"https://patchwork.libcamera.org/api/patches/22731/?format=json","web_url":"https://patchwork.libcamera.org/patch/22731/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250205212725.138055-4-mzamazal@redhat.com>","date":"2025-02-05T21:27:15","name":"[v6,02/10] libcamera: software_isp: Use RGB type to represent gains","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"65c274bda58eb1376401c04edf4396cf13cd7364","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22731/mbox/","series":[{"id":4989,"url":"https://patchwork.libcamera.org/api/series/4989/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4989","date":"2025-02-05T21:27:12","name":"Software ISP support for CCM","version":6,"mbox":"https://patchwork.libcamera.org/series/4989/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22731/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22731/checks/","tags":{},"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 BE869C32F4\n\tfor ;\n\tWed, 5 Feb 2025 21:27:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 473A4685E1;\n\tWed, 5 Feb 2025 22:27:50 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 456A1685D7\n\tfor ;\n\tWed, 5 Feb 2025 22:27:48 +0100 (CET)","from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-164-f5acmzp-MbmLwV4nt-cK4Q-1;\n\tWed, 05 Feb 2025 16:27:45 -0500","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.93])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 1F75A1800874; Wed, 5 Feb 2025 21:27:41 +0000 (UTC)","from mzamazal-thinkpadp1gen3.tpbc.com (unknown [10.45.224.28])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 0DDBD1800265; Wed, 5 Feb 2025 21:27:38 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"X5fk1NIy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1738790867;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=FSgPOHOIEXUaZq+OrL5DpDNYD0XSQoynmU/AG+qRxa4=;\n\tb=X5fk1NIyN+tguqZhQdNccbNK1tl8eGF9r3uZucvKb21BndxfMDvxJUz4acSnGUoIIWmEZr\n\tk/c7mG8PoukVYN5/yx6ZUDZ8xq52Wy5+00vzEXvJhIloj7Xs1w6bjKCD47JtZbvjPyQ4rp\n\tT1Pm/T3OtCsETs7HNPnnMvh/8w1N7SE=","X-MC-Unique":"f5acmzp-MbmLwV4nt-cK4Q-1","X-Mimecast-MFC-AGG-ID":"f5acmzp-MbmLwV4nt-cK4Q","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tRobert Mader ,\n\tHans de Goede ,\n\tLaurent Pinchart ,\n\tKieran Bingham ","Subject":"[PATCH v6 02/10] libcamera: software_isp: Use RGB type to represent\n\tgains","Date":"Wed, 5 Feb 2025 22:27:15 +0100","Message-ID":"<20250205212725.138055-4-mzamazal@redhat.com>","In-Reply-To":"<20250205212725.138055-1-mzamazal@redhat.com>","References":"<20250205212725.138055-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"iD1vGQFkNVWoNPFS7QfgP7VF8nFMs_PXONYhCw3DOh4_1738790864","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","content-type":"text/plain; charset=\"US-ASCII\"; x-default=true","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\" "},"content":"Rather than using a custom struct to represent RGB values, let's use the\ncorresponding type and its facilities.\n\nSigned-off-by: Milan Zamazal \nReviewed-by: Laurent Pinchart \n---\n src/ipa/simple/algorithms/awb.cpp | 16 +++++++++-------\n src/ipa/simple/algorithms/lut.cpp | 14 ++++----------\n src/ipa/simple/ipa_context.h | 7 ++-----\n 3 files changed, 15 insertions(+), 22 deletions(-)","diff":"diff --git a/src/ipa/simple/algorithms/awb.cpp b/src/ipa/simple/algorithms/awb.cpp\nindex 1efc7090..310be6a7 100644\n--- a/src/ipa/simple/algorithms/awb.cpp\n+++ b/src/ipa/simple/algorithms/awb.cpp\n@@ -25,7 +25,7 @@ int Awb::configure(IPAContext &context,\n \t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n {\n \tauto &gains = context.activeState.awb.gains;\n-\tgains.red = gains.green = gains.blue = 1.0;\n+\tgains = { { 1.0, 1.0, 1.0 } };\n \n \treturn 0;\n }\n@@ -56,16 +56,18 @@ void Awb::process(IPAContext &context,\n \t * Clamp max gain at 4.0, this also avoids 0 division.\n \t */\n \tauto &gains = context.activeState.awb.gains;\n-\tgains.red = sumR <= sumG / 4 ? 4.0 : static_cast(sumG) / sumR;\n-\tgains.blue = sumB <= sumG / 4 ? 4.0 : static_cast(sumG) / sumB;\n-\t/* Green gain is fixed to 1.0 */\n+\tgains = { {\n+\t\tsumR <= sumG / 4 ? 4.0 : static_cast(sumG) / sumR,\n+\t\t1.0,\n+\t\tsumB <= sumG / 4 ? 4.0 : static_cast(sumG) / sumB,\n+\t} };\n \n-\tRGB rgbGains{ { 1 / gains.red, 1 / gains.green, 1 / gains.blue } };\n+\tRGB rgbGains{ { 1 / gains.r(), 1 / gains.g(), 1 / gains.b() } };\n \tcontext.activeState.awb.temperatureK = estimateCCT(rgbGains);\n \n \tLOG(IPASoftAwb, Debug)\n-\t\t<< \"gain R/B: \" << gains.red << \"/\" << gains.blue\n-\t\t<< \"; temperature: \" << context.activeState.awb.temperatureK;\n+\t\t<< \"gain R/B: \" << gains << \"; temperature: \"\n+\t\t<< context.activeState.awb.temperatureK;\n }\n \n REGISTER_IPA_ALGORITHM(Awb, \"Awb\")\ndiff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex d75ff710..1d392737 100644\n--- a/src/ipa/simple/algorithms/lut.cpp\n+++ b/src/ipa/simple/algorithms/lut.cpp\n@@ -103,16 +103,10 @@ void Lut::prepare(IPAContext &context,\n \t\tconst double div = static_cast(DebayerParams::kRGBLookupSize) /\n \t\t\t\t gammaTableSize;\n \t\t/* Apply gamma after gain! */\n-\t\tunsigned int idx;\n-\t\tidx = std::min({ static_cast(i * gains.red / div),\n-\t\t\t\t gammaTableSize - 1 });\n-\t\tparams->red[i] = gammaTable[idx];\n-\t\tidx = std::min({ static_cast(i * gains.green / div),\n-\t\t\t\t gammaTableSize - 1 });\n-\t\tparams->green[i] = gammaTable[idx];\n-\t\tidx = std::min({ static_cast(i * gains.blue / div),\n-\t\t\t\t gammaTableSize - 1 });\n-\t\tparams->blue[i] = gammaTable[idx];\n+\t\tconst RGB lutGains = (gains * i / div).min(gammaTableSize - 1);\n+\t\tparams->red[i] = gammaTable[static_cast(lutGains.r())];\n+\t\tparams->green[i] = gammaTable[static_cast(lutGains.g())];\n+\t\tparams->blue[i] = gammaTable[static_cast(lutGains.b())];\n \t}\n }\n \ndiff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h\nindex 607af45a..df0552db 100644\n--- a/src/ipa/simple/ipa_context.h\n+++ b/src/ipa/simple/ipa_context.h\n@@ -14,6 +14,7 @@\n #include \n \n #include \n+#include \n \n namespace libcamera {\n \n@@ -36,11 +37,7 @@ struct IPAActiveState {\n \t} blc;\n \n \tstruct {\n-\t\tstruct {\n-\t\t\tdouble red;\n-\t\t\tdouble green;\n-\t\t\tdouble blue;\n-\t\t} gains;\n+\t\tRGB gains;\n \t\tunsigned int temperatureK;\n \t} awb;\n \n","prefixes":["v6","02/10"]}