{"id":13848,"url":"https://patchwork.libcamera.org/api/patches/13848/?format=json","web_url":"https://patchwork.libcamera.org/patch/13848/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210914142218.64777-1-jeanmichel.hautbois@ideasonboard.com>","date":"2021-09-14T14:22:18","name":"[libcamera-devel,v7.1,4/5] ipa: ipu3: Replace ipa::ipu3::algorithms::Ipu3AwbCell","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d1fac32433441a917c0a8a8c3b4fdf9c1816e124","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13848/mbox/","series":[{"id":2530,"url":"https://patchwork.libcamera.org/api/series/2530/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2530","date":"2021-09-14T14:22:18","name":null,"version":1,"mbox":"https://patchwork.libcamera.org/series/2530/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13848/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13848/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 3653DBDB1D\n\tfor ;\n\tTue, 14 Sep 2021 14:22:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 839B26024A;\n\tTue, 14 Sep 2021 16:22:30 +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 C123560132\n\tfor ;\n\tTue, 14 Sep 2021 16:22:27 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:d0a7:2575:a724:b30a])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 343462A5;\n\tTue, 14 Sep 2021 16:22:27 +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=\"inBpPxxR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1631629347;\n\tbh=CZkR2jangLEMfwbNnjLkECkri13XdnbasiB/E6Yx2q4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=inBpPxxRvgnAaFhZNOX0WIyXB9FLqVTQCIUoYY92jMhkTSzIMGdjQu5TouPSNoIWf\n\tz+BEWAzVQOpdaDrOmEbbeCPOoGvOIsigZtLmJv3YRm6MSbxVtGu4ZH/mb3BGp2FtLE\n\tRAn5FIJSb7BXjJ6LGleicceENOYvpbK8ZGz3B37A=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 14 Sep 2021 16:22:18 +0200","Message-Id":"<20210914142218.64777-1-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210913132803.54881-5-jeanmichel.hautbois@ideasonboard.com>","References":"<20210913132803.54881-5-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7.1 4/5] 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":"","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":"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/20210831185140.77400-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 \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n include/linux/intel-ipu3.h | 28 ++++++++++++++++++++++++++--\n src/ipa/ipu3/algorithms/agc.cpp | 12 +++++-------\n src/ipa/ipu3/algorithms/awb.cpp | 11 +++++------\n src/ipa/ipu3/algorithms/awb.h | 10 ----------\n 4 files changed, 36 insertions(+), 25 deletions(-)","diff":"diff --git a/include/linux/intel-ipu3.h b/include/linux/intel-ipu3.h\nindex ee0e6d0e..a9de8c11 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@@ -72,7 +95,8 @@ struct ipu3_uapi_grid_config {\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+\t (IPU3_UAPI_AWB_SET_SIZE + IPU3_UAPI_AWB_SPARE_FOR_BUBBLES)) / \\\n+\t sizeof(ipu3_uapi_awb_set_item)\n \n \n /**\n@@ -82,7 +106,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 5ff50f4a..208c9713 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -47,9 +47,6 @@ static constexpr uint32_t kMaxExposure = 1976;\n static constexpr uint32_t knumHistogramBins = 256;\n static constexpr double kEvGainTarget = 0.5;\n \n-/* A cell is 8 bytes and contains averages for RGB values and saturation ratio */\n-static constexpr uint8_t kCellSize = 8;\n-\n Agc::Agc()\n \t: frameCount_(0), lastFrame_(0), iqMean_(0.0), lineDuration_(0s),\n \t maxExposureTime_(0s), prevExposure_(0s), prevExposureNoDg_(0s),\n@@ -90,15 +87,16 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,\n \tfor (j = topleftY;\n \t j < topleftY + (aeRegion.size().height >> grid.block_height_log2);\n \t j++) {\n-\t\tfor (i = startX + startY; i < endX + startY; i += kCellSize) {\n+\t\tfor (i = startX + startY; i < endX + startY; i++) {\n \t\t\t/*\n \t\t\t * The grid width (and maybe height) is not reliable.\n \t\t\t * We observed a bit shift which makes the value 160 to be 32 in the stats grid.\n \t\t\t * Use the one passed at init time.\n \t\t\t */\n-\t\t\tif (stats->awb_raw_buffer.meta_data[i + 4 + j * grid.width] == 0) {\n-\t\t\t\tuint8_t Gr = stats->awb_raw_buffer.meta_data[i + 0 + j * grid.width];\n-\t\t\t\tuint8_t Gb = stats->awb_raw_buffer.meta_data[i + 3 + j * grid.width];\n+\t\t\tconst ipu3_uapi_awb_set_item *currentCell = &stats->awb_raw_buffer.meta_data[i + j * grid.width];\n+\t\t\tif (currentCell->sat_ratio == 0) {\n+\t\t\t\tuint8_t Gr = currentCell->Gr_avg;\n+\t\t\t\tuint8_t Gb = currentCell->Gb_avg;\n \t\t\t\thist[(Gr + Gb) / 2]++;\n \t\t\t\tcount++;\n \t\t\t}\ndiff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex d78ae4f4..9ee61638 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -234,17 +234,16 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n \t\t\tuint32_t cellY = ((cellPosition / grid.width) / regionHeight) % kAwbStatsSizeY;\n \n \t\t\tuint32_t awbRegionPosition = cellY * kAwbStatsSizeX + cellX;\n-\t\t\tcellPosition *= 8;\n \n \t\t\t/* Cast the initial IPU3 structure to simplify the reading */\n-\t\t\tIpu3AwbCell *currentCell = reinterpret_cast(const_cast(&stats->awb_raw_buffer.meta_data[cellPosition]));\n-\t\t\tif (currentCell->satRatio == 0) {\n+\t\t\tconst ipu3_uapi_awb_set_item *currentCell = &stats->awb_raw_buffer.meta_data[cellPosition];\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_[awbRegionPosition].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_[awbRegionPosition].sum.green += greenValue / 2;\n-\t\t\t\tawbStats_[awbRegionPosition].sum.red += currentCell->redAvg;\n-\t\t\t\tawbStats_[awbRegionPosition].sum.blue += currentCell->blueAvg;\n+\t\t\t\tawbStats_[awbRegionPosition].sum.red += currentCell->R_avg;\n+\t\t\t\tawbStats_[awbRegionPosition].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 3385ebe7..17905ae8 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","v7.1","4/5"]}