Patch Detail
Show a patch.
GET /api/patches/13995/?format=api
{ "id": 13995, "url": "https://patchwork.libcamera.org/api/patches/13995/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13995/", "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": "<20210930093715.73293-13-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-09-30T09:37:15", "name": "[libcamera-devel,v2,12/12] ipa: ipu3: Replace ipa::ipu3::algorithms::Ipu3AwbCell", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b14530c428d2389d5faea0f390a889e89d10b338", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13995/mbox/", "series": [ { "id": 2587, "url": "https://patchwork.libcamera.org/api/series/2587/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2587", "date": "2021-09-30T09:37:03", "name": "Improve ImgU statistics usage", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2587/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13995/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13995/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 AE0C7BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 30 Sep 2021 09:37:35 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5ACCA691CB;\n\tThu, 30 Sep 2021 11:37:35 +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 48BBE691BB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 30 Sep 2021 11:37:22 +0200 (CEST)", "from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:bab4:22c5:662d:e478])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E28032A8;\n\tThu, 30 Sep 2021 11:37:21 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"gJKBOIX8\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632994642;\n\tbh=7n3rwwG5p25+iqHFrc0LOPVWXaqyLkZ7Kf2dfKGbQQ8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=gJKBOIX8uiVvmVJnzImztUbB8n2t2+wkr5lYdp1pO65LcBzFw/3uJzPYxdFerrfKA\n\tYKGcNmoe+XOUoDIWsc0xe1E26xAu/pSKEn3gq033R0/1zf6sgnpI95ZQq1THiRVqcL\n\tfvtQhjR5Lm//D0rSruZL+5vT6HcNUtUcOvbmAC8o=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 30 Sep 2021 11:37:15 +0200", "Message-Id": "<20210930093715.73293-13-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210930093715.73293-1-jeanmichel.hautbois@ideasonboard.com>", "References": "<20210930093715.73293-1-jeanmichel.hautbois@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 12/12] ipa: ipu3: Replace\n\tipa::ipu3::algorithms::Ipu3AwbCell", "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 intel-ipu3.h public interface from the kernel does not define how to\nparse the statistics for a cell. This had to be identified by a process\nof reverse engineering, and later identifying the structures from [0]\nleading to our custom definition of struct Ipu3AwbCell.\n\n[0]\nhttps://chromium.googlesource.com/chromiumos/platform/arc-camera/+/refs/heads/master/hal/intel/include/ia_imaging/awb_public.h\n\nTo improve the kernel interface, a proposal has been made to the\nlinux-kernel [1] to incorporate the memory layout for each cell into the\nintel-ipu3 header directly.\n\n[1]\nhttps://lore.kernel.org/linux-media/20210930092021.65741-1-jeanmichel.hautbois@ideasonboard.com/\n\nUpdate our local copy of the intel-ipu3.h to match the proposal and\nchange the AGC and AWB algorithms to reference that structure directly,\nallowing us to remove the deprecated custom Ipu3AwbCell definition.\n\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/linux/intel-ipu3.h | 31 +++++++++++++++++++++----\n src/ipa/ipu3/algorithms/agc.cpp | 14 +++++------\n src/ipa/ipu3/algorithms/awb.cpp | 41 ++++++---------------------------\n src/ipa/ipu3/algorithms/awb.h | 10 --------\n 4 files changed, 40 insertions(+), 56 deletions(-)", "diff": "diff --git a/include/linux/intel-ipu3.h b/include/linux/intel-ipu3.h\nindex ee0e6d0e..a5a71ca8 100644\n--- a/include/linux/intel-ipu3.h\n+++ b/include/linux/intel-ipu3.h\n@@ -59,6 +59,29 @@ struct ipu3_uapi_grid_config {\n \t__u16 y_end;\n } __attribute__((packed));\n \n+/**\n+ * struct ipu3_uapi_awb_set_item - Memory layout for each cell in AWB\n+ *\n+ * @Gr_avg:\tGreen average for red lines in the cell.\n+ * @R_avg:\tRed average in the cell.\n+ * @B_avg:\tBlue average in the cell.\n+ * @Gb_avg:\tGreen average for blue lines in the cell.\n+ * @sat_ratio: Saturation ratio in the cell.\n+ * @padding0: Unused byte for padding.\n+ * @padding1: Unused byte for padding.\n+ * @padding2: Unused byte for padding.\n+ */\n+struct ipu3_uapi_awb_set_item {\n+\tunsigned char Gr_avg;\n+\tunsigned char R_avg;\n+\tunsigned char B_avg;\n+\tunsigned char Gb_avg;\n+\tunsigned char sat_ratio;\n+\tunsigned char padding0;\n+\tunsigned char padding1;\n+\tunsigned char padding2;\n+} __attribute__((packed));\n+\n /*\n * The grid based data is divided into \"slices\" called set, each slice of setX\n * refers to ipu3_uapi_grid_config width * height_per_slice.\n@@ -71,9 +94,9 @@ struct ipu3_uapi_grid_config {\n \t(IPU3_UAPI_MAX_BUBBLE_SIZE * IPU3_UAPI_MAX_STRIPES * \\\n \t IPU3_UAPI_AWB_MD_ITEM_SIZE)\n #define IPU3_UAPI_AWB_MAX_BUFFER_SIZE \\\n-\t(IPU3_UAPI_AWB_MAX_SETS * \\\n-\t (IPU3_UAPI_AWB_SET_SIZE + IPU3_UAPI_AWB_SPARE_FOR_BUBBLES))\n-\n+\t((IPU3_UAPI_AWB_MAX_SETS * \\\n+\t (IPU3_UAPI_AWB_SET_SIZE + IPU3_UAPI_AWB_SPARE_FOR_BUBBLES)) / \\\n+\t sizeof(struct ipu3_uapi_awb_set_item))\n \n /**\n * struct ipu3_uapi_awb_raw_buffer - AWB raw buffer\n@@ -82,7 +105,7 @@ struct ipu3_uapi_grid_config {\n *\t\tthe average values for each color channel.\n */\n struct ipu3_uapi_awb_raw_buffer {\n-\t__u8 meta_data[IPU3_UAPI_AWB_MAX_BUFFER_SIZE]\n+\tstruct ipu3_uapi_awb_set_item meta_data[IPU3_UAPI_AWB_MAX_BUFFER_SIZE]\n \t\t__attribute__((aligned(32)));\n } __attribute__((packed));\n \ndiff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 46e01fc4..44008632 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -6,7 +6,6 @@\n */\n \n #include \"agc.h\"\n-#include \"awb.h\"\n \n #include <algorithm>\n #include <chrono>\n@@ -73,18 +72,17 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,\n \n \tfor (unsigned int cellY = 0; cellY < grid.height; cellY++) {\n \t\tfor (unsigned int cellX = 0; cellX < grid.width; cellX++) {\n-\t\t\tuint32_t cellPosition = cellY * stride_ + cellX\n-\t\t\t\t\t * sizeof(Ipu3AwbCell);\n+\t\t\tuint32_t cellPosition = cellY * stride_ + cellX;\n \n \t\t\t/* Cast the initial IPU3 structure to simplify the reading */\n-\t\t\tconst Ipu3AwbCell *cell =\n-\t\t\t\treinterpret_cast<const Ipu3AwbCell *>(\n+\t\t\tconst ipu3_uapi_awb_set_item *cell =\n+\t\t\t\treinterpret_cast<const ipu3_uapi_awb_set_item *>(\n \t\t\t\t\t&stats->awb_raw_buffer.meta_data[cellPosition]\n \t\t\t\t);\n \n-\t\t\tif (cell->satRatio == 0) {\n-\t\t\t\tuint8_t gr = cell->greenRedAvg;\n-\t\t\t\tuint8_t gb = cell->greenBlueAvg;\n+\t\t\tif (cell->sat_ratio == 0) {\n+\t\t\t\tuint8_t gr = cell->Gr_avg;\n+\t\t\t\tuint8_t gb = cell->Gb_avg;\n \t\t\t\thist[(gr + gb) / 2]++;\n \t\t\t}\n \t\t}\ndiff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex fcd1469f..4558f85a 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -104,32 +104,6 @@ static constexpr uint32_t kMinGreenLevelInZone = 32;\n * \\brief Gain calculated for the blue channel\n */\n \n-/**\n- * \\struct Ipu3AwbCell\n- * \\brief Memory layout for each cell in AWB metadata\n- *\n- * The Ipu3AwbCell structure is used to get individual values\n- * such as red average or saturation ratio in a particular cell.\n- *\n- * \\var Ipu3AwbCell::greenRedAvg\n- * \\brief Green average for red lines in the cell\n- *\n- * \\var Ipu3AwbCell::redAvg\n- * \\brief Red average in the cell\n- *\n- * \\var Ipu3AwbCell::blueAvg\n- * \\brief blue average in the cell\n- *\n- * \\var Ipu3AwbCell::greenBlueAvg\n- * \\brief Green average for blue lines\n- *\n- * \\var Ipu3AwbCell::satRatio\n- * \\brief Saturation ratio in the cell\n- *\n- * \\var Ipu3AwbCell::padding\n- * \\brief array of unused bytes for padding\n- */\n-\n /* Default settings for Bayer noise reduction replicated from the Kernel */\n static const struct ipu3_uapi_bnr_static_config imguCssBnrDefaults = {\n \t.wb_gains = { 16, 16, 16, 16 },\n@@ -243,25 +217,24 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats)\n \t */\n \tfor (unsigned int cellY = 0; cellY < kAwbStatsSizeY * cellsPerZoneY_; cellY++) {\n \t\tfor (unsigned int cellX = 0; cellX < kAwbStatsSizeX * cellsPerZoneX_; cellX++) {\n-\t\t\tuint32_t cellPosition = (cellY * stride_ + cellX)\n-\t\t\t\t\t * sizeof(Ipu3AwbCell);\n+\t\t\tuint32_t cellPosition = cellY * stride_ + cellX;\n \t\t\tuint32_t zoneX = cellX / cellsPerZoneX_;\n \t\t\tuint32_t zoneY = cellY / cellsPerZoneY_;\n \n \t\t\tuint32_t awbZonePosition = zoneY * kAwbStatsSizeX + zoneX;\n \n \t\t\t/* Cast the initial IPU3 structure to simplify the reading */\n-\t\t\tconst Ipu3AwbCell *currentCell =\n-\t\t\t\treinterpret_cast<const Ipu3AwbCell *>(\n+\t\t\tconst ipu3_uapi_awb_set_item *currentCell =\n+\t\t\t\treinterpret_cast<const ipu3_uapi_awb_set_item *>(\n \t\t\t\t\t&stats->awb_raw_buffer.meta_data[cellPosition]\n \t\t\t\t);\n-\t\t\tif (currentCell->satRatio == 0) {\n+\t\t\tif (currentCell->sat_ratio == 0) {\n \t\t\t\t/* The cell is not saturated, use the current cell */\n \t\t\t\tawbStats_[awbZonePosition].counted++;\n-\t\t\t\tuint32_t greenValue = currentCell->greenRedAvg + currentCell->greenBlueAvg;\n+\t\t\t\tuint32_t greenValue = currentCell->Gr_avg + currentCell->Gb_avg;\n \t\t\t\tawbStats_[awbZonePosition].sum.green += greenValue / 2;\n-\t\t\t\tawbStats_[awbZonePosition].sum.red += currentCell->redAvg;\n-\t\t\t\tawbStats_[awbZonePosition].sum.blue += currentCell->blueAvg;\n+\t\t\t\tawbStats_[awbZonePosition].sum.red += currentCell->R_avg;\n+\t\t\t\tawbStats_[awbZonePosition].sum.blue += currentCell->B_avg;\n \t\t\t}\n \t\t}\n \t}\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex b3e0ad82..677384ed 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -23,16 +23,6 @@ namespace ipa::ipu3::algorithms {\n static constexpr uint32_t kAwbStatsSizeX = 16;\n static constexpr uint32_t kAwbStatsSizeY = 12;\n \n-/* \\todo Move the cell layout into intel-ipu3.h kernel header */\n-struct Ipu3AwbCell {\n-\tunsigned char greenRedAvg;\n-\tunsigned char redAvg;\n-\tunsigned char blueAvg;\n-\tunsigned char greenBlueAvg;\n-\tunsigned char satRatio;\n-\tunsigned char padding[3];\n-} __attribute__((packed));\n-\n struct Accumulator {\n \tunsigned int counted;\n \tstruct {\n", "prefixes": [ "libcamera-devel", "v2", "12/12" ] }