Patch Detail
Show a patch.
GET /api/1.1/patches/21018/?format=api
{ "id": 21018, "url": "https://patchwork.libcamera.org/api/1.1/patches/21018/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21018/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20240826152224.362773-9-stefan.klug@ideasonboard.com>", "date": "2024-08-26T15:22:06", "name": "[v1,8/8] ipa: rkisp1: Add polynomial LSC loader", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "379b7b1e363cd5b9c1293de6b64ee756fb583999", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/1.1/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21018/mbox/", "series": [ { "id": 4540, "url": "https://patchwork.libcamera.org/api/1.1/series/4540/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4540", "date": "2024-08-26T15:21:58", "name": "Implement polynomial lsc loader", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4540/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21018/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21018/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 C61DEC323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 26 Aug 2024 15:22:53 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 664046341D;\n\tMon, 26 Aug 2024 17:22:53 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8B7656341D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 26 Aug 2024 17:22:51 +0200 (CEST)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:58b7:f3d:c9d4:defa])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 47413480;\n\tMon, 26 Aug 2024 17:21:45 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"wGd3OMdE\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1724685705;\n\tbh=lO9jUXi6lW5dLTIYXMb+hxZtCU9xWsv/WVw8q0dozcQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=wGd3OMdEGDrAZ0JyTJ5O3pj9GvpJMFSL3bWChzZSn9WjbjAajQVlyeVu2nD3LxtuY\n\tSWW/GVg/VEnnnwVHZucQxExYvNcLjCryWQMQotD4GYsy1qWCUacKS7b6ap8cKBMODI\n\te42SdN7zzT4AJQp051mLeObRLfHNn72qOEPjpIV8=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>", "Subject": "[PATCH v1 8/8] ipa: rkisp1: Add polynomial LSC loader", "Date": "Mon, 26 Aug 2024 17:22:06 +0200", "Message-ID": "<20240826152224.362773-9-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240826152224.362773-1-stefan.klug@ideasonboard.com>", "References": "<20240826152224.362773-1-stefan.klug@ideasonboard.com>", "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": "Add a loader that is capable to load polynomial coefficients from the tuning\nfiles. The polynoms are sampled at load time to reduce the computational\noverhead at runtime.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/lsc.cpp | 126 +++++++++++++++++++++++++++++-\n 1 file changed, 125 insertions(+), 1 deletion(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/lsc.cpp b/src/ipa/rkisp1/algorithms/lsc.cpp\nindex 930c188f49e7..573de302e685 100644\n--- a/src/ipa/rkisp1/algorithms/lsc.cpp\n+++ b/src/ipa/rkisp1/algorithms/lsc.cpp\n@@ -16,6 +16,7 @@\n \n #include \"libcamera/internal/yaml_parser.h\"\n \n+#include \"libipa/polynomial.h\"\n #include \"linux/rkisp1-config.h\"\n \n /**\n@@ -68,6 +69,123 @@ namespace ipa::rkisp1::algorithms {\n \n LOG_DEFINE_CATEGORY(RkISP1Lsc)\n \n+class LscPolynomialLoader\n+{\n+public:\n+\tLscPolynomialLoader(const Size &sensorSize,\n+\t\t\t const Rectangle &cropRectangle,\n+\t\t\t const std::vector<double> &xSizes,\n+\t\t\t const std::vector<double> &ySizes)\n+\t\t: sensorSize_(sensorSize),\n+\t\t cropRectangle_(cropRectangle),\n+\t\t xSizes_(xSizes),\n+\t\t ySizes_(ySizes)\n+\t{\n+\t}\n+\n+\tint parseLscData(const YamlObject &yamlSets,\n+\t\t\t std::map<unsigned int, LensShadingCorrection::Components> &lscData)\n+\t{\n+\t\tconst auto &sets = yamlSets.asList();\n+\t\tfor (const auto &yamlSet : sets) {\n+\t\t\tstd::optional<Polynomial> pr, pgr, pgb, pb;\n+\t\t\tuint32_t ct = yamlSet[\"ct\"].get<uint32_t>(0);\n+\n+\t\t\tif (lscData.count(ct)) {\n+\t\t\t\tLOG(RkISP1Lsc, Error)\n+\t\t\t\t\t<< \"Multiple sets found for \"\n+\t\t\t\t\t<< \"color temperature \" << ct;\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tLensShadingCorrection::Components &set = lscData[ct];\n+\t\t\tpr = yamlSet[\"r\"].get<Polynomial>();\n+\t\t\tpgr = yamlSet[\"gr\"].get<Polynomial>();\n+\t\t\tpgb = yamlSet[\"gb\"].get<Polynomial>();\n+\t\t\tpb = yamlSet[\"b\"].get<Polynomial>();\n+\n+\t\t\tif (!(pr || pgr || pgb || pb)) {\n+\t\t\t\tLOG(RkISP1Lsc, Error)\n+\t\t\t\t\t<< \"Failed to parse polynomial for \"\n+\t\t\t\t\t<< \"colour temperature \" << ct;\n+\t\t\t\treturn -EINVAL;\n+\t\t\t}\n+\n+\t\t\tset.ct = ct;\n+\t\t\tpr->setReferenceImageSize(sensorSize_);\n+\t\t\tpgr->setReferenceImageSize(sensorSize_);\n+\t\t\tpgb->setReferenceImageSize(sensorSize_);\n+\t\t\tpb->setReferenceImageSize(sensorSize_);\n+\t\t\tset.r = samplePolynomial(*pr);\n+\t\t\tset.gr = samplePolynomial(*pgr);\n+\t\t\tset.gb = samplePolynomial(*pgb);\n+\t\t\tset.b = samplePolynomial(*pb);\n+\t\t}\n+\n+\t\tif (lscData.empty()) {\n+\t\t\tLOG(RkISP1Lsc, Error) << \"Failed to load any sets\";\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\treturn 0;\n+\t}\n+\n+private:\n+\tstd::vector<double> sizesListToPositions(const std::vector<double> &sizes)\n+\t{\n+\t\tconst int half = sizes.size();\n+\t\tstd::vector<double> res(half * 2 + 1);\n+\t\tdouble x = 0.0;\n+\n+\t\tres[half] = 0.5;\n+\t\tfor (int i = 1; i <= half; i++) {\n+\t\t\tx += sizes[half - i];\n+\t\t\tres[half - i] = 0.5 - x;\n+\t\t\tres[half + i] = 0.5 + x;\n+\t\t}\n+\n+\t\treturn res;\n+\t}\n+\n+\tstd::vector<uint16_t> samplePolynomial(const Polynomial &poly)\n+\t{\n+\t\tconstexpr int k = RKISP1_CIF_ISP_LSC_SAMPLES_MAX;\n+\n+\t\tdouble m = poly.getM();\n+\t\tdouble x0 = cropRectangle_.x / m;\n+\t\tdouble y0 = cropRectangle_.y / m;\n+\t\tdouble w = cropRectangle_.width / m;\n+\t\tdouble h = cropRectangle_.height / m;\n+\t\tstd::vector<uint16_t> res;\n+\n+\t\tassert(xSizes_.size() * 2 + 1 == k);\n+\n+\t\tres.reserve(k * k);\n+\n+\t\tstd::vector<double> xPos(sizesListToPositions(xSizes_));\n+\t\tstd::vector<double> yPos(sizesListToPositions(ySizes_));\n+\n+\t\tfor (int x = 0; x < k; x++) {\n+\t\t\tfor (int y = 0; y < k; y++) {\n+\t\t\t\tdouble xp = x0 + xPos[x] * w;\n+\t\t\t\tdouble yp = y0 + yPos[y] * h;\n+\t\t\t\tint v = static_cast<int>(\n+\t\t\t\t\tpoly.sampleAtNormalizedPixelPos(xp, yp) *\n+\t\t\t\t\t1024);\n+\n+\t\t\t\tv = std::min(std::max(v, 1024), 4095);\n+\t\t\t\tres.push_back(v);\n+\t\t\t}\n+\t\t}\n+\t\treturn res;\n+\t}\n+\n+\tSize sensorSize_;\n+\tRectangle cropRectangle_;\n+\tconst std::vector<double> &xSizes_;\n+\tconst std::vector<double> &ySizes_;\n+};\n+\n class LscClassicLoader\n {\n public:\n@@ -192,11 +310,17 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n \tstd::map<unsigned int, Components> lscData;\n \tint res = 0;\n \tstd::optional<std::string> type = tuningData[\"type\"].get<std::string>();\n-\tif (!type.has_value()) {\n+\tif (!tuningData.contains(\"type\")) {\n \t\tLOG(RkISP1Lsc, Warning) << \"LSC data is in classic format. \"\n \t\t\t\t\t<< \"This will be deprecated soon.\";\n \t\tauto loader = LscClassicLoader();\n \t\tres = loader.parseLscData(yamlSets, lscData);\n+\t} else if (*type == \"polynomial\") {\n+\t\tauto loader = LscPolynomialLoader(context.sensorInfo.activeAreaSize,\n+\t\t\t\t\t\t context.sensorInfo.analogCrop,\n+\t\t\t\t\t\t xSize_,\n+\t\t\t\t\t\t ySize_);\n+\t\tres = loader.parseLscData(yamlSets, lscData);\n \t} else {\n \t\tLOG(RkISP1Lsc, Error) << \"Unsupported LSC type '\" << *type << \"'\";\n \t\tres = -EINVAL;\n", "prefixes": [ "v1", "8/8" ] }