Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-15 16:35:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipa: ipu3: Replace ipa::ipu3::algorithms::Ipu3AwbCell

Browse source 
The intel-ipu3.h public interface from the kernel does not define how to
parse the statistics for a cell. This had to be identified by a process
of reverse engineering, and later identifying the structures from [0]
leading to our custom definition of struct Ipu3AwbCell.

[0]
https://chromium.googlesource.com/chromiumos/platform/arc-camera/+/refs/heads/master/hal/intel/include/ia_imaging/awb_public.h

To improve the kernel interface, a proposal has been made to the
linux-kernel [1] to incorporate the memory layout for each cell into the
intel-ipu3 header directly.

[1]
https://lore.kernel.org/linux-media/20211005202019.253353-1-jeanmichel.hautbois@ideasonboard.com/

Update our local copy of the intel-ipu3.h to match the proposal and
change the AGC and AWB algorithms to reference that structure directly,
allowing us to remove the deprecated custom Ipu3AwbCell definition.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Jean-Michel Hautbois 2021-09-22 23:29:42 +02:00
parent e34ebe008f
commit 09a221eb47
4 changed files with 40 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/ipa/ipu3/algorithms/awb.cpp
View file

@ -108,32 +108,6 @@ static constexpr uint32_t kMinGreenLevelInZone = 32;
* \brief Gain calculated for the blue channel
*/
/**
* \struct Ipu3AwbCell
* \brief Memory layout for each cell in AWB metadata
*
* The Ipu3AwbCell structure is used to get individual values
* such as red average or saturation ratio in a particular cell.
*
* \var Ipu3AwbCell::greenRedAvg
* \brief Green average for red lines in the cell
*
* \var Ipu3AwbCell::redAvg
* \brief Red average in the cell
*
* \var Ipu3AwbCell::blueAvg
* \brief blue average in the cell
*
* \var Ipu3AwbCell::greenBlueAvg
* \brief Green average for blue lines
*
* \var Ipu3AwbCell::satRatio
* \brief Saturation ratio in the cell
*
* \var Ipu3AwbCell::padding
* \brief array of unused bytes for padding
*/
/* Default settings for Bayer noise reduction replicated from the Kernel */
static const struct ipu3_uapi_bnr_static_config imguCssBnrDefaults = {
.wb_gains = { 16, 16, 16, 16 },
@ -247,25 +221,24 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats)
*/
for (unsigned int cellY = 0; cellY < kAwbStatsSizeY * cellsPerZoneY_; cellY++) {
for (unsigned int cellX = 0; cellX < kAwbStatsSizeX * cellsPerZoneX_; cellX++) {
uint32_t cellPosition = (cellY * stride_ + cellX)
* sizeof(Ipu3AwbCell);
uint32_t cellPosition = cellY * stride_ + cellX;
uint32_t zoneX = cellX / cellsPerZoneX_;
uint32_t zoneY = cellY / cellsPerZoneY_;
uint32_t awbZonePosition = zoneY * kAwbStatsSizeX + zoneX;
/* Cast the initial IPU3 structure to simplify the reading */
const Ipu3AwbCell *currentCell =
reinterpret_cast<const Ipu3AwbCell *>(
const ipu3_uapi_awb_set_item *currentCell =
reinterpret_cast<const ipu3_uapi_awb_set_item *>(
&stats->awb_raw_buffer.meta_data[cellPosition]
);
if (currentCell->satRatio == 0) {
if (currentCell->sat_ratio == 0) {
/* The cell is not saturated, use the current cell */
awbStats_[awbZonePosition].counted++;
uint32_t greenValue = currentCell->greenRedAvg + currentCell->greenBlueAvg;
uint32_t greenValue = currentCell->Gr_avg + currentCell->Gb_avg;
awbStats_[awbZonePosition].sum.green += greenValue / 2;
awbStats_[awbZonePosition].sum.red += currentCell->redAvg;
awbStats_[awbZonePosition].sum.blue += currentCell->blueAvg;
awbStats_[awbZonePosition].sum.red += currentCell->R_avg;
awbStats_[awbZonePosition].sum.blue += currentCell->B_avg;
}
}
}