Patch Detail
Show a patch.
GET /api/patches/22772/?format=api
{ "id": 22772, "url": "https://patchwork.libcamera.org/api/patches/22772/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22772/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20250207101703.21149-11-mzamazal@redhat.com>", "date": "2025-02-07T10:17:02", "name": "[v7,10/10] libcamera: software_isp: Apply CCM in debayering", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "1132399406fcc83ae9da002346602f00ea1eeb34", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22772/mbox/", "series": [ { "id": 4994, "url": "https://patchwork.libcamera.org/api/series/4994/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4994", "date": "2025-02-07T10:16:52", "name": "Software ISP support for CCM", "version": 7, "mbox": "https://patchwork.libcamera.org/series/4994/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22772/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22772/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 86532C32EA\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 7 Feb 2025 10:17:47 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4C67D68626;\n\tFri, 7 Feb 2025 11:17:47 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8492B68625\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 7 Feb 2025 11:17:44 +0100 (CET)", "from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-505-bXLSd_cTPjWcK1SV-F_9qQ-1;\n\tFri, 07 Feb 2025 05:17:40 -0500", "from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.15])\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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 24F211955D53; Fri, 7 Feb 2025 10:17:39 +0000 (UTC)", "from mzamazal-thinkpadp1gen3.tpbc.com (unknown [10.45.226.123])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id D5CE519560AE; Fri, 7 Feb 2025 10:17:36 +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=\"Gwz2XDw4\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1738923463;\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=27lEvOKNNV9ynGgP9p+GzjdeB5Cd5xQnr7xIDCm6S+8=;\n\tb=Gwz2XDw4Xc/harNafK8UBcM2SzMpHtgohXsvwaUtZkTy5FfUXGHB9rlb6aLhYvhR/JT+7h\n\tb1K7NI0IJt4TYfyZL/ejAwgbpKvVLwaWI5NP/CXgfLliswuD+5+3lDkcRjry8a8WCgvdZJ\n\tnZ4lNhrDPI5fFpic9oxxxjxPBXSi8Wc=", "X-MC-Unique": "bXLSd_cTPjWcK1SV-F_9qQ-1", "X-Mimecast-MFC-AGG-ID": "bXLSd_cTPjWcK1SV-F_9qQ", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tRobert Mader <robert.mader@collabora.com>,\n\tHans de Goede <hdegoede@redhat.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v7 10/10] libcamera: software_isp: Apply CCM in debayering", "Date": "Fri, 7 Feb 2025 11:17:02 +0100", "Message-ID": "<20250207101703.21149-11-mzamazal@redhat.com>", "In-Reply-To": "<20250207101703.21149-1-mzamazal@redhat.com>", "References": "<20250207101703.21149-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.15", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "LngUqIANWaQNMp7hID_2sCJJPK_TraUgi8UNNfj0eU8_1738923459", "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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This patch applies color correction matrix (CCM) in debayering if the\nCCM is specified. Not using CCM must still be supported for performance\nreasons.\n\nThe CCM is applied as follows:\n\n [r1 g1 b1] [r]\n [r2 g2 b2] * [g]\n [r3 g3 b3] [b]\n\nThe CCM matrix (the left side of the multiplication) is constant during\nsingle frame processing, while the input pixel (the right side) changes.\nBecause each of the color channels is only 8-bit in software ISP, we can\nmake 9 lookup tables with 256 input values for multiplications of each\nof the r_i, g_i, b_i values. This way we don't have to multiply each\npixel, we can use table lookups and additions instead. Gamma (which is\nnon-linear and thus cannot be a part of the 9 lookup tables values) is\napplied on the final values rounded to integers using another lookup\ntable.\n\nBecause the changing part is the pixel value with three color elements,\nonly three dynamic table lookups are needed. We use three lookup tables\nto represent the multiplied matrix values, each of the tables\ncorresponding to the given matrix column and pixel color.\n\nWe use int16_t to store the precomputed multiplications. This seems to\nbe noticeably (>10%) faster than `float' for the price of slightly less\naccuracy and it covers the range of values that sane CCMs produce. The\nselection and structure of data is performance critical, for example\nusing bytes would add significant (>10%) speedup but would be too short\nto cover the value range.\n\nThe color lookup tables can be represented either as unions,\naccommodating tables for both the CCM and non-CCM cases, or as separate\ntables for each of the cases, leaving the tables for the other case\nunused. The latter is selected as a matter of preference.\n\nThe tables are copied (as before), which is not elegant but also not a\nbig problem. There are patches posted that use shared buffers for\nparameters passing in software ISP (see software ISP TODO #5) and they\ncan be adjusted for the new parameter format.\n\nColor gains from white balance are supposed not to be a part of the\nspecified CCM. They are applied on it using matrix multiplication,\nwhich is simple and in correspondence with future additions in the form\nof matrix multiplication, like saturation adjustment.\n\nWith this patch, the reported per-frame slowdown when applying CCM is\nabout 45% on Debix Model A and about 75% on TI AM69 SK.\n\nUsing std::clamp in debayering adds some performance penalty (a few\npercent). The clamping is necessary to eliminate out of range values\npossibly produced by the CCM. If it could be avoided by adjusting the\nprecomputed tables some way then performance could be improved a bit.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../internal/software_isp/debayer_params.h | 34 ++++++++++--\n src/ipa/simple/algorithms/lut.cpp | 53 ++++++++++++++-----\n src/ipa/simple/algorithms/lut.h | 1 +\n src/libcamera/software_isp/debayer.cpp | 51 ++++++++++++++++--\n src/libcamera/software_isp/debayer_cpu.cpp | 53 +++++++++++++++----\n src/libcamera/software_isp/debayer_cpu.h | 10 ++--\n 6 files changed, 169 insertions(+), 33 deletions(-)", "diff": "diff --git a/include/libcamera/internal/software_isp/debayer_params.h b/include/libcamera/internal/software_isp/debayer_params.h\nindex 7d8fdd48..e85b5c60 100644\n--- a/include/libcamera/internal/software_isp/debayer_params.h\n+++ b/include/libcamera/internal/software_isp/debayer_params.h\n@@ -1,6 +1,6 @@\n /* SPDX-License-Identifier: LGPL-2.1-or-later */\n /*\n- * Copyright (C) 2023, 2024 Red Hat Inc.\n+ * Copyright (C) 2023-2025 Red Hat Inc.\n *\n * Authors:\n * Hans de Goede <hdegoede@redhat.com>\n@@ -18,11 +18,35 @@ namespace libcamera {\n struct DebayerParams {\n \tstatic constexpr unsigned int kRGBLookupSize = 256;\n \n-\tusing ColorLookupTable = std::array<uint8_t, kRGBLookupSize>;\n+\tstruct CcmColumn {\n+\t\tint16_t r;\n+\t\tint16_t g;\n+\t\tint16_t b;\n+\t};\n \n-\tColorLookupTable red;\n-\tColorLookupTable green;\n-\tColorLookupTable blue;\n+\tusing LookupTable = std::array<uint8_t, kRGBLookupSize>;\n+\tusing CcmLookupTable = std::array<CcmColumn, kRGBLookupSize>;\n+\n+\t/*\n+\t * Color lookup tables when CCM is not used.\n+\t * Each color of a debayered pixel is amended by the corresponding\n+\t * value in the given table.\n+\t */\n+\tLookupTable red;\n+\tLookupTable green;\n+\tLookupTable blue;\n+\n+\t/*\n+\t * Color and gamma lookup tables when CCM is used.\n+\t * Each of the CcmLookupTable's corresponds to a CCM column; together they\n+\t * make a complete 3x3 CCM lookup table. The CCM is applied on debayered\n+\t * pixels and then the gamma lookup table is used to set the resulting\n+\t * values of all the three colors.\n+\t */\n+\tCcmLookupTable redCcm;\n+\tCcmLookupTable greenCcm;\n+\tCcmLookupTable blueCcm;\n+\tLookupTable gammaLut;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/ipa/simple/algorithms/lut.cpp b/src/ipa/simple/algorithms/lut.cpp\nindex 352bbf57..1eaa2b5e 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, Red Hat Inc.\n+ * Copyright (C) 2024-2025, Red Hat Inc.\n *\n * Color lookup tables construction\n */\n@@ -80,6 +80,11 @@ void Lut::updateGammaTable(IPAContext &context)\n \tcontext.activeState.gamma.contrast = contrast;\n }\n \n+int16_t Lut::ccmValue(unsigned int i, float ccm) const\n+{\n+\treturn std::round(i * ccm);\n+}\n+\n void Lut::prepare(IPAContext &context,\n \t\t [[maybe_unused]] const uint32_t frame,\n \t\t [[maybe_unused]] IPAFrameContext &frameContext,\n@@ -91,22 +96,46 @@ void Lut::prepare(IPAContext &context,\n \t * observed, it's not permanently prone to minor fluctuations or\n \t * rounding errors.\n \t */\n-\tif (context.activeState.gamma.blackLevel != context.activeState.blc.level ||\n-\t context.activeState.gamma.contrast != context.activeState.knobs.contrast)\n+\tconst bool gammaUpdateNeeded =\n+\t\tcontext.activeState.gamma.blackLevel != context.activeState.blc.level ||\n+\t\tcontext.activeState.gamma.contrast != context.activeState.knobs.contrast;\n+\tif (gammaUpdateNeeded)\n \t\tupdateGammaTable(context);\n \n \tauto &gains = context.activeState.awb.gains;\n \tauto &gammaTable = context.activeState.gamma.gammaTable;\n \tconst unsigned int gammaTableSize = gammaTable.size();\n-\n-\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n-\t\tconst double div = static_cast<double>(DebayerParams::kRGBLookupSize) /\n-\t\t\t\t gammaTableSize;\n-\t\t/* Apply gamma after gain! */\n-\t\tconst RGB<float> lutGains = (gains * i / div).min(gammaTableSize - 1);\n-\t\tparams->red[i] = gammaTable[static_cast<unsigned int>(lutGains.r())];\n-\t\tparams->green[i] = gammaTable[static_cast<unsigned int>(lutGains.g())];\n-\t\tparams->blue[i] = gammaTable[static_cast<unsigned int>(lutGains.b())];\n+\tconst double div = static_cast<double>(DebayerParams::kRGBLookupSize) /\n+\t\t\t gammaTableSize;\n+\n+\tif (!context.ccmEnabled) {\n+\t\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n+\t\t\t/* Apply gamma after gain! */\n+\t\t\tconst RGB<float> lutGains = (gains * i / div).min(gammaTableSize - 1);\n+\t\t\tparams->red[i] = gammaTable[static_cast<unsigned int>(lutGains.r())];\n+\t\t\tparams->green[i] = gammaTable[static_cast<unsigned int>(lutGains.g())];\n+\t\t\tparams->blue[i] = gammaTable[static_cast<unsigned int>(lutGains.b())];\n+\t\t}\n+\t} else if (context.activeState.ccm.changed || gammaUpdateNeeded) {\n+\t\tMatrix<float, 3, 3> 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 = gainCcm * context.activeState.ccm.ccm;\n+\t\tauto &red = params->redCcm;\n+\t\tauto &green = params->greenCcm;\n+\t\tauto &blue = params->blueCcm;\n+\t\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n+\t\t\tred[i].r = ccmValue(i, ccm[0][0]);\n+\t\t\tred[i].g = ccmValue(i, ccm[1][0]);\n+\t\t\tred[i].b = ccmValue(i, ccm[2][0]);\n+\t\t\tgreen[i].r = ccmValue(i, ccm[0][1]);\n+\t\t\tgreen[i].g = ccmValue(i, ccm[1][1]);\n+\t\t\tgreen[i].b = ccmValue(i, ccm[2][1]);\n+\t\t\tblue[i].r = ccmValue(i, ccm[0][2]);\n+\t\t\tblue[i].g = ccmValue(i, ccm[1][2]);\n+\t\t\tblue[i].b = ccmValue(i, ccm[2][2]);\n+\t\t\tparams->gammaLut[i] = gammaTable[i / div];\n+\t\t}\n \t}\n }\n \ndiff --git a/src/ipa/simple/algorithms/lut.h b/src/ipa/simple/algorithms/lut.h\nindex 889f864b..77324800 100644\n--- a/src/ipa/simple/algorithms/lut.h\n+++ b/src/ipa/simple/algorithms/lut.h\n@@ -33,6 +33,7 @@ public:\n \n private:\n \tvoid updateGammaTable(IPAContext &context);\n+\tint16_t ccmValue(unsigned int i, float ccm) const;\n };\n \n } /* namespace ipa::soft::algorithms */\ndiff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp\nindex 34e42201..ca81d2e4 100644\n--- a/src/libcamera/software_isp/debayer.cpp\n+++ b/src/libcamera/software_isp/debayer.cpp\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: LGPL-2.1-or-later */\n /*\n * Copyright (C) 2023, Linaro Ltd\n- * Copyright (C) 2023, 2024 Red Hat Inc.\n+ * Copyright (C) 2023-2025 Red Hat Inc.\n *\n * Authors:\n * Hans de Goede <hdegoede@redhat.com>\n@@ -24,8 +24,33 @@ namespace libcamera {\n */\n \n /**\n- * \\typedef DebayerParams::ColorLookupTable\n- * \\brief Type of the lookup tables for red, green, blue values\n+ * \\struct DebayerParams::CcmColumn\n+ * \\brief Type of a single column of a color correction matrix (CCM)\n+ */\n+\n+/**\n+ * \\var DebayerParams::CcmColumn::r\n+ * \\brief Red (first) component of a CCM column\n+ */\n+\n+/**\n+ * \\var DebayerParams::CcmColumn::g\n+ * \\brief Green (second) component of a CCM column\n+ */\n+\n+/**\n+ * \\var DebayerParams::CcmColumn::b\n+ * \\brief Blue (third) component of a CCM column\n+ */\n+\n+/**\n+ * \\typedef DebayerParams::LookupTable\n+ * \\brief Type of the lookup tables for single lookup values\n+ */\n+\n+/**\n+ * \\typedef DebayerParams::CcmLookupTable\n+ * \\brief Type of the CCM lookup tables for red, green, blue values\n */\n \n /**\n@@ -43,6 +68,26 @@ namespace libcamera {\n * \\brief Lookup table for blue color, mapping input values to output values\n */\n \n+/**\n+ * \\var DebayerParams::redCcm\n+ * \\brief CCM lookup table for red color, mapping input values to output values\n+ */\n+\n+/**\n+ * \\var DebayerParams::greenCcm\n+ * \\brief CCM lookup table for green color, mapping input values to output values\n+ */\n+\n+/**\n+ * \\var DebayerParams::blueCcm\n+ * \\brief CCM lookup table for blue color, mapping input values to output values\n+ */\n+\n+/**\n+ * \\var DebayerParams::gammaLut\n+ * \\brief Gamma lookup table used with color correction matrix\n+ */\n+\n /**\n * \\class Debayer\n * \\brief Base debayering class\ndiff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex 0cd03a8f..83a171d8 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: LGPL-2.1-or-later */\n /*\n * Copyright (C) 2023, Linaro Ltd\n- * Copyright (C) 2023, Red Hat Inc.\n+ * Copyright (C) 2023-2025 Red Hat Inc.\n *\n * Authors:\n * Hans de Goede <hdegoede@redhat.com>\n@@ -11,9 +11,11 @@\n \n #include \"debayer_cpu.h\"\n \n+#include <algorithm>\n #include <stdlib.h>\n #include <sys/ioctl.h>\n #include <time.h>\n+#include <utility>\n \n #include <linux/dma-buf.h>\n \n@@ -51,8 +53,12 @@ DebayerCpu::DebayerCpu(std::unique_ptr<SwStatsCpu> stats)\n \tenableInputMemcpy_ = true;\n \n \t/* Initialize color lookup tables */\n-\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++)\n+\tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\n \t\tred_[i] = green_[i] = blue_[i] = i;\n+\t\tredCcm_[i] = { 1, 0, 0 };\n+\t\tgreenCcm_[i] = { 0, 1, 0 };\n+\t\tblueCcm_[i] = { 0, 0, 1 };\n+\t}\n }\n \n DebayerCpu::~DebayerCpu() = default;\n@@ -62,12 +68,24 @@ DebayerCpu::~DebayerCpu() = default;\n \tconst pixel_t *curr = (const pixel_t *)src[1] + xShift_; \\\n \tconst pixel_t *next = (const pixel_t *)src[2] + xShift_;\n \n-#define STORE_PIXEL(b, g, r) \\\n-\t*dst++ = blue_[b]; \\\n-\t*dst++ = green_[g]; \\\n-\t*dst++ = red_[r]; \\\n-\tif constexpr (addAlphaByte) \\\n-\t\t*dst++ = 255; \\\n+#define GAMMA(value) \\\n+\t*dst++ = gammaLut_[std::clamp(value, 0, static_cast<int>(gammaLut_.size()) - 1)]\n+\n+#define STORE_PIXEL(b_, g_, r_) \\\n+\tif constexpr (ccmEnabled) { \\\n+\t\tconst DebayerParams::CcmColumn &blue = blueCcm_[b_]; \\\n+\t\tconst DebayerParams::CcmColumn &green = greenCcm_[g_]; \\\n+\t\tconst DebayerParams::CcmColumn &red = redCcm_[r_]; \\\n+\t\tGAMMA(blue.b + green.b + red.b); \\\n+\t\tGAMMA(blue.g + green.g + red.g); \\\n+\t\tGAMMA(blue.r + green.r + red.r); \\\n+\t} else { \\\n+\t\t*dst++ = blue_[b_]; \\\n+\t\t*dst++ = green_[g_]; \\\n+\t\t*dst++ = red_[r_]; \\\n+\t} \\\n+\tif constexpr (addAlphaByte) \\\n+\t\t*dst++ = 255; \\\n \tx++;\n \n /*\n@@ -755,8 +773,23 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n \t\tdmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Write);\n \n \tgreen_ = params.green;\n-\tred_ = swapRedBlueGains_ ? params.blue : params.red;\n-\tblue_ = swapRedBlueGains_ ? params.red : params.blue;\n+\tgreenCcm_ = params.greenCcm;\n+\tif (swapRedBlueGains_) {\n+\t\tred_ = params.blue;\n+\t\tblue_ = params.red;\n+\t\tredCcm_ = params.blueCcm;\n+\t\tblueCcm_ = params.redCcm;\n+\t\tfor (unsigned int i = 0; i < 256; i++) {\n+\t\t\tstd::swap(redCcm_[i].r, redCcm_[i].b);\n+\t\t\tstd::swap(blueCcm_[i].r, blueCcm_[i].b);\n+\t\t}\n+\t} else {\n+\t\tred_ = params.red;\n+\t\tblue_ = params.blue;\n+\t\tredCcm_ = params.redCcm;\n+\t\tblueCcm_ = params.blueCcm;\n+\t}\n+\tgammaLut_ = params.gammaLut;\n \n \t/* Copy metadata from the input buffer */\n \tFrameMetadata &metadata = output->_d()->metadata();\ndiff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\nindex 21c08a2d..926195e9 100644\n--- a/src/libcamera/software_isp/debayer_cpu.h\n+++ b/src/libcamera/software_isp/debayer_cpu.h\n@@ -138,9 +138,13 @@ private:\n \t/* Max. supported Bayer pattern height is 4, debayering this requires 5 lines */\n \tstatic constexpr unsigned int kMaxLineBuffers = 5;\n \n-\tDebayerParams::ColorLookupTable red_;\n-\tDebayerParams::ColorLookupTable green_;\n-\tDebayerParams::ColorLookupTable blue_;\n+\tDebayerParams::LookupTable red_;\n+\tDebayerParams::LookupTable green_;\n+\tDebayerParams::LookupTable blue_;\n+\tDebayerParams::CcmLookupTable redCcm_;\n+\tDebayerParams::CcmLookupTable greenCcm_;\n+\tDebayerParams::CcmLookupTable blueCcm_;\n+\tDebayerParams::LookupTable gammaLut_;\n \tdebayerFn debayer0_;\n \tdebayerFn debayer1_;\n \tdebayerFn debayer2_;\n", "prefixes": [ "v7", "10/10" ] }