[{"id":19575,"web_url":"https://patchwork.libcamera.org/comment/19575/","msgid":"<4ee85af2-004c-b67e-0965-5ce3bf006dd8@ideasonboard.com>","date":"2021-09-09T10:59:08","subject":"Re: [libcamera-devel] [PATCH v5 4/4] ipa: ipu3: Replace\n\tipa::ipu3::algorithms::Ipu3AwbCell","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 09/09/2021 09:25, 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 <jeanmichel.hautbois@ideasonboard.com>\n> ---\n>  include/linux/intel-ipu3.h      | 28 ++++++++++++++++++++++++++--\n>  src/ipa/ipu3/algorithms/agc.cpp |  7 ++++---\n>  src/ipa/ipu3/algorithms/awb.cpp | 11 +++++------\n>  src/ipa/ipu3/algorithms/awb.h   | 10 ----------\n>  4 files changed, 35 insertions(+), 21 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\nAhh now we have a new term too. A 'set' is a 'cell' ...\n\nIs this name from something external? or defined by us? (or the\nCrOS/Intel awb_public.h?)\n\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>  \n> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\n> index 5ff50f4a..8740dcdf 100644\n> --- a/src/ipa/ipu3/algorithms/agc.cpp\n> +++ b/src/ipa/ipu3/algorithms/agc.cpp\n> @@ -96,9 +96,10 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,\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}\n> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n> index bc0aa6fe..5d6fa4d4 100644\n> --- a/src/ipa/ipu3/algorithms/awb.cpp\n> +++ b/src/ipa/ipu3/algorithms/awb.cpp\n> @@ -201,17 +201,16 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n>  \t\t\tuint32_t cellY = ((cellPosition / grid.width) / regionHeight) % kAwbStatsSizeY;\n\nNow that we're definitely talking about cells, I would rename\nregionWidth and regionHeight to be cellWidth and cellHeight to match the\nnaming of the structure, and the fact that we already use cellPosition.\n\n(but do this in a separate patch on top).\n\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<Ipu3AwbCell *>(const_cast<uint8_t *>(&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\nLike wise, here the awbRegionPosition is ... I presume the zonePosition?\n\nCan you refactor this to make it all consistent in the terminology please?\n\n (again, not in this patch, definitely on top).\n\nSo for this patch which just moves the structure and naming accordingly:\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n\n\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}\n> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n> index 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>","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 0A81ABDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu,  9 Sep 2021 10:59:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5F9A069170;\n\tThu,  9 Sep 2021 12:59:11 +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 5CB126916B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  9 Sep 2021 12:59:10 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E12C2466;\n\tThu,  9 Sep 2021 12:59:09 +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=\"dwCZkmdo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1631185150;\n\tbh=+P1SGG7/oI38B6H9zkcj+AzLnzXfqnZc2AS9W3wBFSI=;\n\th=To:References:From:Subject:Date:In-Reply-To:From;\n\tb=dwCZkmdoH9J85QHN3S8u6gnp9w9tCEwEjhgs0TBeDErCj20gxuDw9EoLDTFa0GsXS\n\tuDQFNkpzXDg6B9toQcUQq2/50Z6yQohXoTAwxMQewteY0slo1DMgJD8YMQBJXsRFcP\n\tJMy/l7FufuvCVMt5MPz3ZjRm1imB5C3llPGI86bw=","To":"Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210909082516.26055-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210909082516.26055-5-jeanmichel.hautbois@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<4ee85af2-004c-b67e-0965-5ce3bf006dd8@ideasonboard.com>","Date":"Thu, 9 Sep 2021 11:59:08 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.11.0","MIME-Version":"1.0","In-Reply-To":"<20210909082516.26055-5-jeanmichel.hautbois@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v5 4/4] 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>"}},{"id":19579,"web_url":"https://patchwork.libcamera.org/comment/19579/","msgid":"<2ab176e4-9cdf-5990-c44a-9c76aed92b15@ideasonboard.com>","date":"2021-09-09T13:32:15","subject":"Re: [libcamera-devel] [PATCH v5 4/4] 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":"On 09/09/2021 12:59, Kieran Bingham wrote:\n> On 09/09/2021 09:25, 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 <jeanmichel.hautbois@ideasonboard.com>\n>> ---\n>>  include/linux/intel-ipu3.h      | 28 ++++++++++++++++++++++++++--\n>>  src/ipa/ipu3/algorithms/agc.cpp |  7 ++++---\n>>  src/ipa/ipu3/algorithms/awb.cpp | 11 +++++------\n>>  src/ipa/ipu3/algorithms/awb.h   | 10 ----------\n>>  4 files changed, 35 insertions(+), 21 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> \n> Ahh now we have a new term too. A 'set' is a 'cell' ...\n> \n> Is this name from something external? or defined by us? (or the\n> CrOS/Intel awb_public.h?)\n> \n\nThis is defined in the CrOS/Intel awb_public.h file...\n\n\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\nBingbu asked to change it from unsigned char to __u8...\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>>  \n>> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\n>> index 5ff50f4a..8740dcdf 100644\n>> --- a/src/ipa/ipu3/algorithms/agc.cpp\n>> +++ b/src/ipa/ipu3/algorithms/agc.cpp\n>> @@ -96,9 +96,10 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,\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}\n>> diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\n>> index bc0aa6fe..5d6fa4d4 100644\n>> --- a/src/ipa/ipu3/algorithms/awb.cpp\n>> +++ b/src/ipa/ipu3/algorithms/awb.cpp\n>> @@ -201,17 +201,16 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n>>  \t\t\tuint32_t cellY = ((cellPosition / grid.width) / regionHeight) % kAwbStatsSizeY;\n> \n> Now that we're definitely talking about cells, I would rename\n> regionWidth and regionHeight to be cellWidth and cellHeight to match the\n> naming of the structure, and the fact that we already use cellPosition.\n> \n> (but do this in a separate patch on top).\n> \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<Ipu3AwbCell *>(const_cast<uint8_t *>(&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> \n> Like wise, here the awbRegionPosition is ... I presume the zonePosition?\n> \n> Can you refactor this to make it all consistent in the terminology please?\n> \n>  (again, not in this patch, definitely on top).\n\nYes, it deserves its own patch, thanks.\n\n> \n> So for this patch which just moves the structure and naming accordingly:\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> \n> \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}\n>> diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\n>> index 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>>","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 32F36BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu,  9 Sep 2021 13:32:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 96FDF69170;\n\tThu,  9 Sep 2021 15:32:18 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C37706916B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  9 Sep 2021 15:32:17 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:ab35:be36:579e:39cf])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5FE2E883;\n\tThu,  9 Sep 2021 15:32:17 +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=\"Y6Xoqtz5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1631194337;\n\tbh=GwOBIDwsLdsGaEmxrWpge5rr7i3ocWGb/AXnMpvfZyg=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=Y6Xoqtz5ws1TzXj/qagZDIFgdsCAHkXKL0V8JLBdu6Zg18vGGu0V/OTBQbbKr06Gq\n\tQhdgSyRAUSM293dYXhOgz/tfv0w8m/U4oWVmT/n2khxHVdKwmsX/3fV58YQPPoFKYx\n\tsgcgT3GeQYCMbxM2XZ4zHAwa1xJGXe1zGfw1jocQ=","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210909082516.26055-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20210909082516.26055-5-jeanmichel.hautbois@ideasonboard.com>\n\t<4ee85af2-004c-b67e-0965-5ce3bf006dd8@ideasonboard.com>","From":"Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>","Message-ID":"<2ab176e4-9cdf-5990-c44a-9c76aed92b15@ideasonboard.com>","Date":"Thu, 9 Sep 2021 15:32:15 +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":"<4ee85af2-004c-b67e-0965-5ce3bf006dd8@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH v5 4/4] 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>"}}]