[{"id":20001,"web_url":"https://patchwork.libcamera.org/comment/20001/","msgid":"","date":"2021-09-29T13:05:16","subject":"Re: [libcamera-devel] [PATCH 12/12] ipa: ipu3: Replace\n\tipa::ipu3::algorithms::Ipu3AwbCell","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Thu, Sep 23, 2021 at 10:16:25AM +0200, Jean-Michel Hautbois wrote:\n> The intel-ipu3.h public interface from the kernel does not define how to\n> parse the statistics for a cell. This had to be identified by a process\n> of reverse engineering, and later identifying the structures from [0]\n> leading to our custom definition of struct Ipu3AwbCell.\n> \n> [0]\n> https://chromium.googlesource.com/chromiumos/platform/arc-camera/+/refs/heads/master/hal/intel/include/ia_imaging/awb_public.h\n> \n> To improve the kernel interface, a proposal has been made to the\n> linux-kernel [1] to incorporate the memory layout for each cell into the\n> intel-ipu3 header directly.\n> \n> [1]\n> https://lore.kernel.org/linux-media/20210831185140.77400-1-jeanmichel.hautbois@ideasonboard.com/\n> \n> Update our local copy of the intel-ipu3.h to match the proposal and\n> change the AGC and AWB algorithms to reference that structure directly,\n> allowing us to remove the deprecated custom Ipu3AwbCell definition.\n> \n> Signed-off-by: Jean-Michel Hautbois \n> Reviewed-by: Kieran Bingham \n> Reviewed-by: Laurent Pinchart \n> ---\n> include/linux/intel-ipu3.h | 28 ++++++++++++++++++++--\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, 39 insertions(+), 54 deletions(-)\n> \n> diff --git a/include/linux/intel-ipu3.h b/include/linux/intel-ipu3.h\n> index 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\nMissing parentheses.\n\nThis doesn't match [1], is it intentional ?\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> \n> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\n> index ebbc5676..b04c0170 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 \n> #include \n> @@ -76,18 +75,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 < stride_; 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(\n> +\t\t\tconst ipu3_uapi_awb_set_item *cell =\n> +\t\t\t\treinterpret_cast(\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}\n> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> index 3013870b..06570b60 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> @@ -244,25 +218,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(\n> +\t\t\tconst ipu3_uapi_awb_set_item *currentCell =\n> +\t\t\t\treinterpret_cast(\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}\n> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n> index 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 {","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 754F6BDC71\n\tfor ;\n\tWed, 29 Sep 2021 13:05:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E387B691AA;\n\tWed, 29 Sep 2021 15:05:19 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 67CBC69185\n\tfor ;\n\tWed, 29 Sep 2021 15:05:18 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C47223F0;\n\tWed, 29 Sep 2021 15:05:17 +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=\"wYu2lVpm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632920718;\n\tbh=xypTvvnikW/qsyYSW13DYfBar1DL8uWf7+90aFI/MUg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=wYu2lVpmhfBpyFLOQTKSwPbiz7TzVgT29O+LjrSB/0epfUCas/EB0sp1A8vaUQYR3\n\tJX2f0o+dwJEQ/27A35d7n+wvqiyk6hzbZCrrbociqI1n+Fy6G/rsnd3FnHCQtFsBfx\n\tFdMAwYtqJjsV32WuBdNnoGcXeuC6DyU63PzEk/pE=","Date":"Wed, 29 Sep 2021 16:05:16 +0300","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20210923081625.60276-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210923081625.60276-13-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210923081625.60276-13-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":20003,"web_url":"https://patchwork.libcamera.org/comment/20003/","msgid":"<8aee8cbc-5a22-614b-ad7a-b6dae5106b65@ideasonboard.com>","date":"2021-09-29T16:26:12","subject":"Re: [libcamera-devel] [PATCH 12/12] ipa: ipu3: Replace\n\tipa::ipu3::algorithms::Ipu3AwbCell","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 29/09/2021 15:05, Laurent Pinchart wrote:\n> On Thu, Sep 23, 2021 at 10:16:25AM +0200, Jean-Michel Hautbois wrote:\n>> The intel-ipu3.h public interface from the kernel does not define how to\n>> parse the statistics for a cell. This had to be identified by a process\n>> of reverse engineering, and later identifying the structures from [0]\n>> leading to our custom definition of struct Ipu3AwbCell.\n>>\n>> [0]\n>> https://chromium.googlesource.com/chromiumos/platform/arc-camera/+/refs/heads/master/hal/intel/include/ia_imaging/awb_public.h\n>>\n>> To improve the kernel interface, a proposal has been made to the\n>> linux-kernel [1] to incorporate the memory layout for each cell into the\n>> intel-ipu3 header directly.\n>>\n>> [1]\n>> https://lore.kernel.org/linux-media/20210831185140.77400-1-jeanmichel.hautbois@ideasonboard.com/\n>>\n>> Update our local copy of the intel-ipu3.h to match the proposal and\n>> change the AGC and AWB algorithms to reference that structure directly,\n>> allowing us to remove the deprecated custom Ipu3AwbCell definition.\n>>\n>> Signed-off-by: Jean-Michel Hautbois \n>> Reviewed-by: Kieran Bingham \n>> Reviewed-by: Laurent Pinchart \n>> ---\n>> include/linux/intel-ipu3.h | 28 ++++++++++++++++++++--\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, 39 insertions(+), 54 deletions(-)\n>>\n>> diff --git a/include/linux/intel-ipu3.h b/include/linux/intel-ipu3.h\n>> index 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> Missing parentheses.\n> \n> This doesn't match [1], is it intentional ?\n> \n\nIt is not, I need to push this version instead of the one in [1]. I\nshould do that in a short notice ;-).\n\nWhat parentheses are missing, I'm sorry, I can't see it...\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>> \n>> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\n>> index ebbc5676..b04c0170 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 \n>> #include \n>> @@ -76,18 +75,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 < stride_; 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(\n>> +\t\t\tconst ipu3_uapi_awb_set_item *cell =\n>> +\t\t\t\treinterpret_cast(\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}\n>> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n>> index 3013870b..06570b60 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>> @@ -244,25 +218,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(\n>> +\t\t\tconst ipu3_uapi_awb_set_item *currentCell =\n>> +\t\t\t\treinterpret_cast(\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}\n>> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n>> index 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>","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 75BAABDC71\n\tfor ;\n\tWed, 29 Sep 2021 16:26:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9CCF8691AA;\n\tWed, 29 Sep 2021 18:26:16 +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 3751869185\n\tfor ;\n\tWed, 29 Sep 2021 18:26:15 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:b4ce:851b:eca:f3fe])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9DE28DEE;\n\tWed, 29 Sep 2021 18:26:14 +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=\"SvyCJffo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632932774;\n\tbh=zRUT9a214V/p4TTklaDPGbhcNJDdQlA/gsoL8RbHaq4=;\n\th=Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=SvyCJffo6sthV4qpd2xdvBjzcrAWiyu8wHOchO+k8D+LwHVcRnj4SVKfObRApcXQv\n\tWin5YE/+7fyvRxteM7b+RHXlPKRd8bTLFXcR8JgeBSiEi+2gnlRYPzqv+J2vmxFkUZ\n\tcJczc8eFSiOjEB/S9VQhwAeAIbML+vKSFRc5s6fo=","To":"Laurent Pinchart ","References":"<20210923081625.60276-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210923081625.60276-13-jeanmichel.hautbois@ideasonboard.com>\n\t","From":"Jean-Michel Hautbois ","Message-ID":"<8aee8cbc-5a22-614b-ad7a-b6dae5106b65@ideasonboard.com>","Date":"Wed, 29 Sep 2021 18:26:12 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.13.0","MIME-Version":"1.0","In-Reply-To":"","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":20004,"web_url":"https://patchwork.libcamera.org/comment/20004/","msgid":"","date":"2021-09-29T16:40:34","subject":"Re: [libcamera-devel] [PATCH 12/12] ipa: ipu3: Replace\n\tipa::ipu3::algorithms::Ipu3AwbCell","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Wed, Sep 29, 2021 at 06:26:12PM +0200, Jean-Michel Hautbois wrote:\n> On 29/09/2021 15:05, Laurent Pinchart wrote:\n> > On Thu, Sep 23, 2021 at 10:16:25AM +0200, Jean-Michel Hautbois wrote:\n> >> The intel-ipu3.h public interface from the kernel does not define how to\n> >> parse the statistics for a cell. This had to be identified by a process\n> >> of reverse engineering, and later identifying the structures from [0]\n> >> leading to our custom definition of struct Ipu3AwbCell.\n> >>\n> >> [0]\n> >> https://chromium.googlesource.com/chromiumos/platform/arc-camera/+/refs/heads/master/hal/intel/include/ia_imaging/awb_public.h\n> >>\n> >> To improve the kernel interface, a proposal has been made to the\n> >> linux-kernel [1] to incorporate the memory layout for each cell into the\n> >> intel-ipu3 header directly.\n> >>\n> >> [1]\n> >> https://lore.kernel.org/linux-media/20210831185140.77400-1-jeanmichel.hautbois@ideasonboard.com/\n> >>\n> >> Update our local copy of the intel-ipu3.h to match the proposal and\n> >> change the AGC and AWB algorithms to reference that structure directly,\n> >> allowing us to remove the deprecated custom Ipu3AwbCell definition.\n> >>\n> >> Signed-off-by: Jean-Michel Hautbois \n> >> Reviewed-by: Kieran Bingham \n> >> Reviewed-by: Laurent Pinchart \n> >> ---\n> >> include/linux/intel-ipu3.h | 28 ++++++++++++++++++++--\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, 39 insertions(+), 54 deletions(-)\n> >>\n> >> diff --git a/include/linux/intel-ipu3.h b/include/linux/intel-ipu3.h\n> >> index 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> > Missing parentheses.\n> > \n> > This doesn't match [1], is it intentional ?\n> \n> It is not, I need to push this version instead of the one in [1]. I\n> should do that in a short notice ;-).\n\nHave you determined why the sizes are different ?\n\n> What parentheses are missing, I'm sorry, I can't see it...\n\nOuter parentheses around the whole expression.\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> >> \n> >> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\n> >> index ebbc5676..b04c0170 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 \n> >> #include \n> >> @@ -76,18 +75,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 < stride_; 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(\n> >> +\t\t\tconst ipu3_uapi_awb_set_item *cell =\n> >> +\t\t\t\treinterpret_cast(\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}\n> >> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> >> index 3013870b..06570b60 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> >> @@ -244,25 +218,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(\n> >> +\t\t\tconst ipu3_uapi_awb_set_item *currentCell =\n> >> +\t\t\t\treinterpret_cast(\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}\n> >> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n> >> index 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 {","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 E68EDC3243\n\tfor ;\n\tWed, 29 Sep 2021 16:40:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1561A691AF;\n\tWed, 29 Sep 2021 18:40:39 +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 4BBB369185\n\tfor ;\n\tWed, 29 Sep 2021 18:40:37 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A89C83F0;\n\tWed, 29 Sep 2021 18:40:36 +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=\"A7oY0tpe\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632933636;\n\tbh=A/4QVEWCuqLPSYE6xNFeDhuA+KpCcip+fDL1wfvKdZA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=A7oY0tpeQ7GfFgtwGqRvwtWcKEiUgUEz9qutHyEQLnebpaFeyzpquEJCzUpXVU3JH\n\tlb56RHSauHWP4C6c2mvYLkQm+ckCdvyOnolTHzFu/xdCp8hcjVmlbk7AOske2tVR3O\n\tJXKjPUhXbZi5FlMl0wu2ZMggWSmAPopxQoMec1SY=","Date":"Wed, 29 Sep 2021 19:40:34 +0300","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20210923081625.60276-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210923081625.60276-13-jeanmichel.hautbois@ideasonboard.com>\n\t\n\t<8aee8cbc-5a22-614b-ad7a-b6dae5106b65@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<8aee8cbc-5a22-614b-ad7a-b6dae5106b65@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]