Patch Detail
Show a patch.
GET /api/patches/24045/?format=api
{ "id": 24045, "url": "https://patchwork.libcamera.org/api/patches/24045/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24045/", "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": "<20250804111118.10190-1-david.plowman@raspberrypi.com>", "date": "2025-08-04T11:11:18", "name": "ipa: rpi: ccm: Implement \"manual\" CCM mode", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b4c297be518c213aa94b06c1cbf3841a1ce5cd3d", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24045/mbox/", "series": [ { "id": 5353, "url": "https://patchwork.libcamera.org/api/series/5353/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5353", "date": "2025-08-04T11:11:18", "name": "ipa: rpi: ccm: Implement \"manual\" CCM mode", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5353/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24045/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24045/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 88946BDCC1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 4 Aug 2025 11:11:25 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9FB2C6921D;\n\tMon, 4 Aug 2025 13:11:24 +0200 (CEST)", "from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com\n\t[IPv6:2a00:1450:4864:20::42f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 641896920D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 4 Aug 2025 13:11:23 +0200 (CEST)", "by mail-wr1-x42f.google.com with SMTP id\n\tffacd0b85a97d-3b8d0f1fb49so2097958f8f.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 04 Aug 2025 04:11:23 -0700 (PDT)", "from raspberrypi.pitowers.org\n\t([2a00:1098:3142:1f:ffc9:aff6:7f7f:893b])\n\tby smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-458a7c91c0esm143148155e9.11.2025.08.04.04.11.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 04 Aug 2025 04:11:21 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"toAQWUHe\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1754305882; x=1754910682;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:message-id:date:subject:cc\n\t:to:from:from:to:cc:subject:date:message-id:reply-to;\n\tbh=71DARSHGgyE699X1OTM5rrKd2lu2B9IbK9KdxuSzV0w=;\n\tb=toAQWUHeBckmKxMvF4AHISvtByBU4wLCWzGjlyqNNy4l2f/42q8j7AKc3c6PoZkMJu\n\t5Hn5TxwCA/RZeJOXGfSBQS6pNKwQOgDTQbhF0cHl7xGT7lDbEMFsCYbPjiW86rY/BtCH\n\tqm80CHBy7p0TCrO1r0cP/xVPPpnM8+iq9BBGOSI0dyvz1TkxFyxofTHKxHQzyum1LVrC\n\tE2TzTXqQTw+RvnDmkHscxFnEuyffoHrzFGZYm4Lyg0bobmHf9siaugGZ6CrOAUiTx4wY\n\telQvTuYxTiclgOHD3yfgFI0Y6K1BKNwLOuZ0mwdEML1X5ivUSnw7f7Mpp+FAP9Y96XP8\n\tShEw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1754305882; x=1754910682;\n\th=content-transfer-encoding:mime-version:message-id:date:subject:cc\n\t:to:from:x-gm-message-state:from:to:cc:subject:date:message-id\n\t:reply-to;\n\tbh=71DARSHGgyE699X1OTM5rrKd2lu2B9IbK9KdxuSzV0w=;\n\tb=vOqj+qnyePcO2eHiTJK8IR1oxKYXzKBXqEk1rITo+Y1eX/e6/SCWyadcODZyfcyr6T\n\tIbJRsNqVBBvMHgCcLzh9X7XKvHRIenFpPhW6Ypd98J7M6xemcq2IeYxl77JH3WPhSY1c\n\thc5j8litKvlMb86tPaiU9sWFtr5kUA3cz7nJzYaFA2MbxEnjfByzlaIp9nTyjCTgkmfY\n\teimKqEQ0RK5z7rhP8gRKsn6QyXJJxsyTdDIzJAAmkP9NgsNQIJSWwml4R9JMAmbfitpE\n\tek71zfjzJQkUKShnIoLEzwUcK4jXhxBQ0WHMYO34XlFGVB19X5JE7M74SLI7QVjichPT\n\taQYg==", "X-Gm-Message-State": "AOJu0Yys+Srexogsc5ZuZhC/cIAIQrRtrtcL/0zIM94gtHIp/5AGqnoQ\n\t2rKodJtihWcVHV1R1Pvj7ctrEaes2c5x4TkkbVtA2KUaD5q7c6cmIYOk865ivpvoXlZghW6+vw/\n\tab3Ju1F8=", "X-Gm-Gg": "ASbGncsUWe7ZT/KMhMSGPTkSudm0U2Xk4DtfbpLJZzVqqj99RrPKKv9QB28VcfL8uQp\n\tOg33uMPGesKBQJJsT22WsXv2hy+ByPmkMA7bR61zPQSIWv+8PLMsbvzTitgiLTq6bfR3aUQNj7i\n\t8pFOOrdClCV5UTja1bQL+KKR+u/QSldrk76RxnVCGP8Ed/1BVvsZQ9KJd2Bo4oRpIBx9AKPQckQ\n\tI6I3uHPCEP7VCzTIsRAHbMe2pKyORstoz/OvsZfamzUEoUa1A20wW4HijhDTnnyqdZbyqsgIMXZ\n\tQ4LlBeXcXVkEuVHvzVkkMAoE/khIrvF0xUiwZw1NsweF0RCVL26dB3hC5J/69bnOrhZcPGKD2f6\n\t5R8EvmaKzoJ8EwWUeIymgNGhbWqHpRnt8xjqG33EgzJ2RYzn2GKfDig==", "X-Google-Smtp-Source": "AGHT+IFNtjtpJQzL6QrjBfS020hhFpT+9E2Ujr3hx0MznZio9RO0w0ICbdpuijybvLi8oaxu0eJdrg==", "X-Received": "by 2002:a5d:5d10:0:b0:3a4:fbaf:749e with SMTP id\n\tffacd0b85a97d-3b8d94c2141mr6211953f8f.49.1754305882346; \n\tMon, 04 Aug 2025 04:11:22 -0700 (PDT)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "David Plowman <david.plowman@raspberrypi.com>", "Subject": "[PATCH] ipa: rpi: ccm: Implement \"manual\" CCM mode", "Date": "Mon, 4 Aug 2025 12:11:18 +0100", "Message-Id": "<20250804111118.10190-1-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.39.5", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "The CCM algorithm will now let an explicit colour matrix be set when\nAWB is in manual mode.\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\n---\n src/ipa/rpi/common/ipa_base.cpp | 67 +++++++++++++++++++++++---\n src/ipa/rpi/common/ipa_base.h | 2 +\n src/ipa/rpi/controller/ccm_algorithm.h | 6 +++\n src/ipa/rpi/controller/rpi/ccm.cpp | 21 +++++++-\n src/ipa/rpi/controller/rpi/ccm.h | 5 +-\n 5 files changed, 92 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp\nindex ce2343e9..3153bee6 100644\n--- a/src/ipa/rpi/common/ipa_base.cpp\n+++ b/src/ipa/rpi/common/ipa_base.cpp\n@@ -94,6 +94,7 @@ const ControlInfoMap::Map ipaColourControls{\n \t{ &controls::AwbEnable, ControlInfo(false, true) },\n \t{ &controls::AwbMode, ControlInfo(controls::AwbModeValues) },\n \t{ &controls::ColourGains, ControlInfo(0.0f, 32.0f) },\n+\t{ &controls::ColourCorrectionMatrix, ControlInfo(0.0f, 8.0f) },\n \t{ &controls::ColourTemperature, ControlInfo(100, 100000) },\n \t{ &controls::Saturation, ControlInfo(0.0f, 32.0f, 1.0f) },\n };\n@@ -126,7 +127,7 @@ namespace ipa::RPi {\n IpaBase::IpaBase()\n \t: controller_(), frameLengths_(FrameLengthsQueueSize, 0s), statsMetadataOutput_(false),\n \t stitchSwapBuffers_(false), frameCount_(0), mistrustCount_(0), lastRunTimestamp_(0),\n-\t firstStart_(true), flickerState_({ 0, 0s })\n+\t firstStart_(true), flickerState_({ 0, 0s }), awbEnabled_(true)\n {\n }\n \n@@ -1049,13 +1050,21 @@ void IpaBase::applyControls(const ControlList &controls)\n \t\t\t\tbreak;\n \t\t\t}\n \n-\t\t\tif (ctrl.second.get<bool>() == false)\n+\t\t\tawbEnabled_ = ctrl.second.get<bool>();\n+\n+\t\t\tif (!awbEnabled_)\n \t\t\t\tawb->disableAuto();\n-\t\t\telse\n+\t\t\telse {\n \t\t\t\tawb->enableAuto();\n \n-\t\t\tlibcameraMetadata_.set(controls::AwbEnable,\n-\t\t\t\t\t ctrl.second.get<bool>());\n+\t\t\t\t/* If AWB is running, the CCM must go back to auto as well. */\n+\t\t\t\tRPiController::CcmAlgorithm *ccm = dynamic_cast<RPiController::CcmAlgorithm *>(\n+\t\t\t\t\tcontroller_.getAlgorithm(\"ccm\"));\n+\t\t\t\tif (ccm)\n+\t\t\t\t\tccm->enableAuto();\n+\t\t\t}\n+\n+\t\t\tlibcameraMetadata_.set(controls::AwbEnable, awbEnabled_);\n \t\t\tbreak;\n \t\t}\n \n@@ -1098,10 +1107,20 @@ void IpaBase::applyControls(const ControlList &controls)\n \t\t\t}\n \n \t\t\tawb->setManualGains(gains[0], gains[1]);\n-\t\t\tif (gains[0] != 0.0f && gains[1] != 0.0f)\n+\t\t\tif (gains[0] != 0.0f && gains[1] != 0.0f) {\n \t\t\t\t/* A gain of 0.0f will switch back to auto mode. */\n \t\t\t\tlibcameraMetadata_.set(controls::ColourGains,\n \t\t\t\t\t\t { gains[0], gains[1] });\n+\t\t\t\tawbEnabled_ = false; /* puts AWB into manual mode */\n+\t\t\t} else {\n+\t\t\t\tawbEnabled_ = true; /* puts AWB into auto mode */\n+\n+\t\t\t\t/* If AWB is running, the CCM must go back to auto as well. */\n+\t\t\t\tRPiController::CcmAlgorithm *ccm = dynamic_cast<RPiController::CcmAlgorithm *>(\n+\t\t\t\t\tcontroller_.getAlgorithm(\"ccm\"));\n+\t\t\t\tif (ccm)\n+\t\t\t\t\tccm->enableAuto();\n+\t\t\t}\n \t\t\tbreak;\n \t\t}\n \n@@ -1120,10 +1139,46 @@ void IpaBase::applyControls(const ControlList &controls)\n \t\t\t}\n \n \t\t\tawb->setColourTemperature(temperatureK);\n+\t\t\tawbEnabled_ = false; /* this puts AWB into manual mode */\n \t\t\t/* This metadata will get reported back automatically. */\n \t\t\tbreak;\n \t\t}\n \n+\t\tcase controls::COLOUR_CORRECTION_MATRIX: {\n+\t\t\tif (monoSensor_)\n+\t\t\t\tbreak;\n+\n+\t\t\tauto floats = ctrl.second.get<Span<const float>>();\n+\t\t\tRPiController::CcmAlgorithm *ccm = dynamic_cast<RPiController::CcmAlgorithm *>(\n+\t\t\t\tcontroller_.getAlgorithm(\"ccm\"));\n+\t\t\tif (!ccm) {\n+\t\t\t\tLOG(IPARPI, Warning)\n+\t\t\t\t\t<< \"Could not set COLOUR_CORRECTION_MATRIX - no CCM algorithm\";\n+\t\t\t\tbreak;\n+\t\t\t}\n+\n+\t\t\t/* We are guaranteed this control contains 9 values. Nevertheless: */\n+\t\t\tassert(floats.size() == 9);\n+\n+\t\t\tMatrix<double, 3, 3> matrix;\n+\t\t\tfor (std::size_t i = 0; i < 3; ++i)\n+\t\t\t\tfor (std::size_t j = 0; j < 3; ++j)\n+\t\t\t\t\tmatrix[i][j] = static_cast<double>(floats[i * 3 + j]);\n+\n+\t\t\tccm->setCcm(matrix);\n+\n+\t\t\t/*\n+\t\t\t * But if AWB is running, go back to auto mode. The CCM gets remembered,\n+\t\t\t * which avoids the race between setting the CCM and disabling AWB in\n+\t\t\t * the same set of controls.\n+\t\t\t */\n+\t\t\tif (awbEnabled_)\n+\t\t\t\tccm->enableAuto();\n+\n+\t\t\t/* This metadata will be reported back automatically. */\n+\t\t\tbreak;\n+\t\t}\n+\n \t\tcase controls::BRIGHTNESS: {\n \t\t\tRPiController::ContrastAlgorithm *contrast = dynamic_cast<RPiController::ContrastAlgorithm *>(\n \t\t\t\tcontroller_.getAlgorithm(\"contrast\"));\ndiff --git a/src/ipa/rpi/common/ipa_base.h b/src/ipa/rpi/common/ipa_base.h\nindex e2f6e330..5348f2ea 100644\n--- a/src/ipa/rpi/common/ipa_base.h\n+++ b/src/ipa/rpi/common/ipa_base.h\n@@ -140,6 +140,8 @@ private:\n \t\tint32_t mode;\n \t\tutils::Duration manualPeriod;\n \t} flickerState_;\n+\n+\tbool awbEnabled_;\n };\n \n } /* namespace ipa::RPi */\ndiff --git a/src/ipa/rpi/controller/ccm_algorithm.h b/src/ipa/rpi/controller/ccm_algorithm.h\nindex 6678ba75..785c408a 100644\n--- a/src/ipa/rpi/controller/ccm_algorithm.h\n+++ b/src/ipa/rpi/controller/ccm_algorithm.h\n@@ -6,16 +6,22 @@\n */\n #pragma once\n \n+#include \"libcamera/internal/matrix.h\"\n+\n #include \"algorithm.h\"\n \n namespace RPiController {\n \n+using Matrix3x3 = libcamera::Matrix<double, 3, 3>;\n+\n class CcmAlgorithm : public Algorithm\n {\n public:\n \tCcmAlgorithm(Controller *controller) : Algorithm(controller) {}\n \t/* A CCM algorithm must provide the following: */\n+\tvirtual void enableAuto() = 0;\n \tvirtual void setSaturation(double saturation) = 0;\n+\tvirtual void setCcm(Matrix3x3 const &matrix) = 0;\n };\n \n } /* namespace RPiController */\ndiff --git a/src/ipa/rpi/controller/rpi/ccm.cpp b/src/ipa/rpi/controller/rpi/ccm.cpp\nindex 8607f152..25bcea2d 100644\n--- a/src/ipa/rpi/controller/rpi/ccm.cpp\n+++ b/src/ipa/rpi/controller/rpi/ccm.cpp\n@@ -32,7 +32,7 @@ LOG_DEFINE_CATEGORY(RPiCcm)\n using Matrix3x3 = Matrix<double, 3, 3>;\n \n Ccm::Ccm(Controller *controller)\n-\t: CcmAlgorithm(controller), saturation_(1.0) {}\n+\t: CcmAlgorithm(controller), enableAuto_(true), saturation_(1.0) {}\n \n char const *Ccm::name() const\n {\n@@ -78,11 +78,22 @@ int Ccm::read(const libcamera::YamlObject ¶ms)\n \treturn 0;\n }\n \n+void Ccm::enableAuto()\n+{\n+\tenableAuto_ = true;\n+}\n+\n void Ccm::setSaturation(double saturation)\n {\n \tsaturation_ = saturation;\n }\n \n+void Ccm::setCcm(Matrix3x3 const &matrix)\n+{\n+\tenableAuto_ = false;\n+\tmanualCcm_ = matrix;\n+}\n+\n void Ccm::initialise()\n {\n }\n@@ -151,7 +162,13 @@ void Ccm::prepare(Metadata *imageMetadata)\n \t\tLOG(RPiCcm, Warning) << \"no colour temperature found\";\n \tif (!luxOk)\n \t\tLOG(RPiCcm, Warning) << \"no lux value found\";\n-\tMatrix3x3 ccm = calculateCcm(config_.ccms, awb.temperatureK);\n+\n+\tMatrix3x3 ccm;\n+\tif (enableAuto_)\n+\t\tccm = calculateCcm(config_.ccms, awb.temperatureK);\n+\telse\n+\t\tccm = manualCcm_;\n+\n \tdouble saturation = saturation_;\n \tstruct CcmStatus ccmStatus;\n \tccmStatus.saturation = saturation;\ndiff --git a/src/ipa/rpi/controller/rpi/ccm.h b/src/ipa/rpi/controller/rpi/ccm.h\nindex c05dbb17..70f28ed3 100644\n--- a/src/ipa/rpi/controller/rpi/ccm.h\n+++ b/src/ipa/rpi/controller/rpi/ccm.h\n@@ -8,7 +8,6 @@\n \n #include <vector>\n \n-#include \"libcamera/internal/matrix.h\"\n #include <libipa/pwl.h>\n \n #include \"../ccm_algorithm.h\"\n@@ -33,13 +32,17 @@ public:\n \tCcm(Controller *controller = NULL);\n \tchar const *name() const override;\n \tint read(const libcamera::YamlObject ¶ms) override;\n+\tvoid enableAuto() override;\n \tvoid setSaturation(double saturation) override;\n+\tvoid setCcm(Matrix3x3 const &matrix) override;\n \tvoid initialise() override;\n \tvoid prepare(Metadata *imageMetadata) override;\n \n private:\n \tCcmConfig config_;\n+\tbool enableAuto_;\n \tdouble saturation_;\n+\tMatrix3x3 manualCcm_;\n };\n \n } /* namespace RPiController */\n", "prefixes": [] }