Patch Detail
Show a patch.
GET /api/patches/17830/?format=api
{ "id": 17830, "url": "https://patchwork.libcamera.org/api/patches/17830/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17830/", "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": "<20221122112224.31691-2-naush@raspberrypi.com>", "date": "2022-11-22T11:22:20", "name": "[libcamera-devel,v1,1/5] ipa: raspberrypi: Generalise statistics", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "032e63614f97822ef882d483428c1a1fe78ce67d", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17830/mbox/", "series": [ { "id": 3627, "url": "https://patchwork.libcamera.org/api/series/3627/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3627", "date": "2022-11-22T11:22:19", "name": "Raspberry Pi: Generalise statistics", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3627/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17830/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17830/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 5E1A7BE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 22 Nov 2022 11:22:30 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 11081603CE;\n\tTue, 22 Nov 2022 12:22:29 +0100 (CET)", "from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com\n\t[IPv6:2a00:1450:4864:20::42b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3551561F2B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Nov 2022 12:22:28 +0100 (CET)", "by mail-wr1-x42b.google.com with SMTP id e11so11304781wru.8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 22 Nov 2022 03:22:28 -0800 (PST)", "from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tq125-20020a1c4383000000b003c6cd82596esm21400388wma.43.2022.11.22.03.22.26\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 22 Nov 2022 03:22:27 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1669116149;\n\tbh=YmRgADhS3s4kSwmcHgSScFX3tgmguW1qArHN7RPr/5I=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=uW5DALLZOwCBfTk4Dknuq0AonVD3UIuCFFHhcwTJLYisg9zHN+yfq0GOZXds/AkHG\n\tOtYBJ2T+RjKrXQBmwkKvkc6uhfWfXbo9/nkv3T90O3Dz/bKSfDgESHufE+gvbUJC84\n\t9NBtbthgE45RCCAt0zGsasbklMq2O811lCtz4nlzgRAlAiVi8Z2djfBIBEMRVvESn/\n\tCY+6j6CpNaA8tHMQl1Z+GN7dS0+UecU2O3HqlQM6D38UiJI9U3AYgvc+MDjMB9y35h\n\tPUrswJnodIQDHOumRFczvH9orUldofnoRjAlhuoTSvx9gwLVLJ7d1RSKqby15Hef7N\n\tj5+MPwiH55Xdg==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=84I5pgUTPV442TRgUl4HrW7AgpbIpJKmlWRibV0h/I4=;\n\tb=phmvlgWah2hV1vjsEKp5ZfZlNGpLiaawYE1R9o4/MHB0p7E4+p22zWwVfrnfaLkmM4\n\tPO8sHCdvg3n7aN50wk81AHSIJ4ShxhKFPrKlR63W+9ceuqzHILHupoKpO4DQo5PsYxxn\n\t6P/MhoW4NLWBlrf4avbOHB3VzwvgHZXdKO6qR+CvrMDujYe31OuSUS1uByVYTQ7EwoMj\n\t1rVftyaXqbF+0PUStO33EYHutT9Ijw4k3Vq4fkfmQ6IfpNBKWc5XIuoSAoOOUH4/f94N\n\t403RepUHpEfzuhnoRlLOcOLB+goEG8dO+2zZz2vsxzJtzU23+lpfBrfZJIdubZVRMUyY\n\tfRdg==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"phmvlgWa\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=84I5pgUTPV442TRgUl4HrW7AgpbIpJKmlWRibV0h/I4=;\n\tb=TICtatDBd4jc3jw48Uiyy+mMLPy+gRRquanLO9QhiOz1gZM2BRl1weykGDoSg+I7EC\n\teG8xUlNsRb0mv17YMmCDhVJUo5mqT499b9a9Tu5btqJa8TOdKGqkqFr4JolMYyHKZjFt\n\t4s87z6w2RD6c3fdQimond7qbwOVL/01zok7lIAg9ZYUFpXjXd9KpwRc1WWjRLh976UET\n\tZ4+tgwDRHXL8RnimjUBTK0koJDVDVBT1vLgb1cwG/yoyU4kqTKaD3osXfr4WuCWXFm4Z\n\tJzfpl6j74jryTFKWDRF9uYQGBOS9NMpGyNE8nAkYuqSS2Ps9SgQLTdOjWUjx1JgV4b6+\n\t6z4A==", "X-Gm-Message-State": "ANoB5pnQHKjC8CHaBWmnuZAQQWhMkLd24IRBGbBApGsxNdqNXiSTBARM\n\tdXiSYend9bmR0JWQBKh7kiULLlBSK4AWZQ==", "X-Google-Smtp-Source": "AA0mqf6WeZtqpmhakrTBt5+bLFCcjeN3XcRd+2fXR4daE2NtufFNs3t6ZCEN0DGGSJOp3Efg7qz17w==", "X-Received": "by 2002:adf:dc8b:0:b0:22e:2b7:f215 with SMTP id\n\tr11-20020adfdc8b000000b0022e02b7f215mr6731651wrj.512.1669116147541; \n\tTue, 22 Nov 2022 03:22:27 -0800 (PST)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 22 Nov 2022 11:22:20 +0000", "Message-Id": "<20221122112224.31691-2-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20221122112224.31691-1-naush@raspberrypi.com>", "References": "<20221122112224.31691-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v1 1/5] ipa: raspberrypi: Generalise\n\tstatistics", "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>", "From": "Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Naushir Patuck <naush@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "At present, the controller algorithms access the bcm2835_isp_stats structure,\nwhich is hardware specific. It would be desirable to abstract out the statistics\nstructure to remove hardware specific headers from the algorithms source files.\n\nDefine a new templated RegionStats class that encompasses region based\nstatistics generated by the ISP. For the VC4 ISP, this can be used to hold\nRGB sums and focus FoM values.\n\nDefine a new Statistics structure that holds all the VC4 ISP statistics output.\nThis includes AGC hostograms, AGC/AWB region sums and focus FoM regions.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\n---\n src/ipa/raspberrypi/controller/region_stats.h | 109 ++++++++++++++++++\n src/ipa/raspberrypi/statistics.h | 70 +++++++++++\n 2 files changed, 179 insertions(+)\n create mode 100644 src/ipa/raspberrypi/controller/region_stats.h\n create mode 100644 src/ipa/raspberrypi/statistics.h", "diff": "diff --git a/src/ipa/raspberrypi/controller/region_stats.h b/src/ipa/raspberrypi/controller/region_stats.h\nnew file mode 100644\nindex 000000000000..8a3453617654\n--- /dev/null\n+++ b/src/ipa/raspberrypi/controller/region_stats.h\n@@ -0,0 +1,109 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2022, Raspberry Pi Ltd\n+ *\n+ * region_stats.h - Raspberry Pi region based statistics container\n+ */\n+#pragma once\n+\n+#include <array>\n+#include <stdint.h>\n+#include <vector>\n+\n+namespace RPiController {\n+\n+template<typename T>\n+class RegionStats\n+{\n+public:\n+\tRegionStats()\n+\t\t: numRows_(0), numCols_(0), numFloating_(0)\n+\t{\n+\t}\n+\n+\tvoid init(unsigned int numRows, unsigned int numCols = 1, unsigned int numFloating = 0)\n+\t{\n+\t\tnumRows_ = numRows;\n+\t\tnumCols_ = numCols;\n+\t\tnumFloating_ = numFloating;\n+\t\tregions_.resize(numRows_ * numCols_ + numFloating_);\n+\t}\n+\n+\tunsigned int numRegions() const\n+\t{\n+\t\treturn numRows_ * numCols_;\n+\t}\n+\n+\tunsigned int numFloatingRegions() const\n+\t{\n+\t\treturn numFloating_;\n+\t}\n+\n+\tvoid set(unsigned int index, const T &value, uint32_t counted, uint32_t uncounted)\n+\t{\n+\t\tif (index >= numRegions())\n+\t\t\treturn;\n+\t\tset_(index, value, counted, uncounted);\n+\t}\n+\n+\tvoid set(unsigned int row, unsigned int col, const T &value, uint32_t counted, uint32_t uncounted)\n+\t{\n+\t\tset(row * numCols_ + col, value, counted, uncounted);\n+\t}\n+\n+\tvoid setFloating(unsigned int index, const T &value, uint32_t counted, uint32_t uncounted)\n+\t{\n+\t\tif (index >= numFloatingRegions())\n+\t\t\treturn;\n+\t\tset(numRegions() + index, value, counted, uncounted);\n+\t}\n+\n+\tconst T &get(unsigned int index, uint32_t &counted, uint32_t &uncounted) const\n+\t{\n+\t\tcounted = uncounted = 0;\n+\t\tif (index >= numRegions())\n+\t\t\treturn default_;\n+\t\treturn get_(index, counted, uncounted);\n+\t}\n+\n+\tconst T &get(unsigned int row, unsigned int col, uint32_t &counted, uint32_t &uncounted) const\n+\t{\n+\t\treturn get(row * numCols_ + col, counted, uncounted);\n+\t}\n+\n+\tconst T &getFloating(unsigned int index, uint32_t &counted, uint32_t &uncounted) const\n+\t{\n+\t\tcounted = uncounted = 0;\n+\t\tif (index >= numFloatingRegions())\n+\t\t\treturn default_;\n+\t\treturn get_(numRegions() + index, counted, uncounted);\n+\t}\n+\n+private:\n+\tvoid set_(unsigned int index, const T &value, uint32_t counted, uint32_t uncounted)\n+\t{\n+\t\tregions_[index] = { value, counted, uncounted };\n+\t}\n+\n+\tconst T &get_(unsigned int index, uint32_t &counted, uint32_t &uncounted) const\n+\t{\n+\t\tcounted = regions_[index].counted;\n+\t\tuncounted = regions_[index].uncounted;\n+\t\treturn regions_[index].value;\n+\t}\n+\n+\tunsigned int numRows_;\n+\tunsigned int numCols_;\n+\tunsigned int numFloating_;\n+\n+\tstruct Region {\n+\t\tT value;\n+\t\tuint32_t counted;\n+\t\tuint32_t uncounted;\n+\t};\n+\n+\tstd::vector<Region> regions_;\n+\tT default_;\n+};\n+\n+} /* namespace RPiController */\ndiff --git a/src/ipa/raspberrypi/statistics.h b/src/ipa/raspberrypi/statistics.h\nnew file mode 100644\nindex 000000000000..a762bf3d41aa\n--- /dev/null\n+++ b/src/ipa/raspberrypi/statistics.h\n@@ -0,0 +1,70 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2022, Raspberry Pi Ltd\n+ *\n+ * statistics.h - Raspberry Pi generic statistics structure\n+ */\n+#pragma once\n+\n+#include <memory>\n+#include <stdint.h>\n+#include <vector>\n+\n+#include \"histogram.h\"\n+#include \"region_stats.h\"\n+\n+namespace RPiController {\n+\n+struct RgbySums {\n+\tRgbySums(uint64_t _rSum = 0, uint64_t _gSum = 0, uint64_t _bSum = 0, uint64_t _ySum = 0)\n+\t\t: rSum(_rSum), gSum(_gSum), bSum(_bSum), ySum(_ySum)\n+\t{\n+\t}\n+\tuint64_t rSum;\n+\tuint64_t gSum;\n+\tuint64_t bSum;\n+\tuint64_t ySum;\n+};\n+\n+using RgbyRegions = RegionStats<RgbySums>;\n+using FocusRegions = RegionStats<uint64_t>;\n+\n+struct Statistics {\n+\t/*\n+\t * Positioning of the AGC statistics gathering in the pipeline:\n+\t * Pre-WB correction or post-WB correction.\n+\t * Assume this is post-LSC.\n+\t */\n+\tenum class AgcStatsPos { PreWb, PostWb };\n+\tconst AgcStatsPos agcStatsPos;\n+\n+\t/*\n+\t * Positioning of the AWB/ALSC statistics gathering in the pipeline:\n+\t * Pre-LSC or post-LSC.\n+\t */\n+\tenum class ColourStatsPos { PreLsc, PostLsc };\n+\tconst ColourStatsPos colourStatsPos;\n+\n+\tStatistics(AgcStatsPos a, ColourStatsPos c)\n+\t\t: agcStatsPos(a), colourStatsPos(c)\n+\t{\n+\t}\n+\n+\t/* Histogram statistics. Not all histograms may be populated! */\n+\tHistogram rHist;\n+\tHistogram gHist;\n+\tHistogram bHist;\n+\tHistogram yHist;\n+\n+\t/* Row sums for flicker avoidance. */\n+\tstd::vector<RgbySums> rowSums;\n+\n+\t/* Region based colour sums. */\n+\tRgbyRegions agcRegions;\n+\tRgbyRegions awbRegions;\n+\n+\t/* Region based focus FoM. */\n+\tFocusRegions focusRegions;\n+};\n+\n+} /* namespace RPiController */\n", "prefixes": [ "libcamera-devel", "v1", "1/5" ] }