{"id":21258,"url":"https://patchwork.libcamera.org/api/1.1/patches/21258/?format=json","web_url":"https://patchwork.libcamera.org/patch/21258/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240913075750.35115-10-stefan.klug@ideasonboard.com>","date":"2024-09-13T07:57:27","name":"[v2,9/9] ipa: rkisp1: Add polynomial LSC loader","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0eb56c1b7a004298f6e289a5a64a5b03a754ee0f","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21258/mbox/","series":[{"id":4587,"url":"https://patchwork.libcamera.org/api/1.1/series/4587/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4587","date":"2024-09-13T07:57:18","name":"Implement polynomial lsc support","version":2,"mbox":"https://patchwork.libcamera.org/series/4587/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21258/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21258/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 7EEF2C324C\n\tfor ;\n\tFri, 13 Sep 2024 07:58:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 270E76350E;\n\tFri, 13 Sep 2024 09:58:23 +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 599C663504\n\tfor ;\n\tFri, 13 Sep 2024 09:58:19 +0200 (CEST)","from ideasonboard.com (213-229-8-243.static.upcbusiness.at\n\t[213.229.8.243])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8C25A1011;\n\tFri, 13 Sep 2024 09:57:00 +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=\"eYuIyF9f\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1726214220;\n\tbh=xJLxMRw47iu6x6DQ3E63NZqhqnC645GatEgAZzP+h7E=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=eYuIyF9f4fkGuYl8BVwuRvGdmMZKAuzzf79QLGJUOb/sivgWwBk9/azzOBnaGm6Bw\n\t94XYIBYDDsBLTdxIcAbRSV75eBsBtUxJ9TiDzFzS8NfWU9GNPJ6/M6MicFi0bqZyfZ\n\tgXDpGcOcOIopR6qZgdInIuF1Nc+P/8c3vTi9S9Ss=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v2 9/9] ipa: rkisp1: Add polynomial LSC loader","Date":"Fri, 13 Sep 2024 09:57:27 +0200","Message-ID":"<20240913075750.35115-10-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20240913075750.35115-1-stefan.klug@ideasonboard.com>","References":"<20240913075750.35115-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":"","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":"Add a loader that is capable to load polynomial coefficients from the\ntuning files. The polynoms are sampled at load time to reduce the\ncomputational overhead at runtime.\n\nSigned-off-by: Stefan Klug \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 12867b8f7d0f..b0ad2234cd11 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/lsc_polynomial.h\"\n #include \"linux/rkisp1-config.h\"\n \n /**\n@@ -70,6 +71,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 &xSizes,\n+\t\t\t const std::vector &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 &lscData)\n+\t{\n+\t\tconst auto &sets = yamlSets.asList();\n+\t\tfor (const auto &yamlSet : sets) {\n+\t\t\tstd::optional pr, pgr, pgb, pb;\n+\t\t\tuint32_t ct = yamlSet[\"ct\"].get(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();\n+\t\t\tpgr = yamlSet[\"gr\"].get();\n+\t\t\tpgb = yamlSet[\"gb\"].get();\n+\t\t\tpb = yamlSet[\"b\"].get();\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 sizesListToPositions(const std::vector &sizes)\n+\t{\n+\t\tconst int half = sizes.size();\n+\t\tstd::vector 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 samplePolynomial(const LscPolynomial &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 res;\n+\n+\t\tassert(xSizes_.size() * 2 + 1 == k);\n+\n+\t\tres.reserve(k * k);\n+\n+\t\tstd::vector xPos(sizesListToPositions(xSizes_));\n+\t\tstd::vector 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(\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 &xSizes_;\n+\tconst std::vector &ySizes_;\n+};\n+\n class LscClassicLoader\n {\n public:\n@@ -193,11 +311,17 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,\n \tstd::map lscData;\n \tint res = 0;\n \tstd::optional type = tuningData[\"type\"].get();\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":["v2","9/9"]}