NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 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

14
src/ipa/ipu3/algorithms/agc.cpp
View file

@ -6,7 +6,6 @@
*/
#include "agc.h"
#include "awb.h"
#include <algorithm>
#include <chrono>
@ -73,17 +72,16 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,
for (unsigned int cellY = 0; cellY < grid.height; cellY++) {
for (unsigned int cellX = 0; cellX < grid.width; cellX++) {
uint32_t cellPosition = (cellY * stride_ + cellX)
* sizeof(Ipu3AwbCell);
uint32_t cellPosition = cellY * stride_ + cellX;
const Ipu3AwbCell *cell =
reinterpret_cast<const Ipu3AwbCell *>(
const ipu3_uapi_awb_set_item *cell =
reinterpret_cast<const ipu3_uapi_awb_set_item *>(
&stats->awb_raw_buffer.meta_data[cellPosition]
);
if (cell->satRatio == 0) {
uint8_t gr = cell->greenRedAvg;
uint8_t gb = cell->greenBlueAvg;
if (cell->sat_ratio == 0) {
uint8_t gr = cell->Gr_avg;
uint8_t gb = cell->Gb_avg;
hist[(gr + gb) / 2]++;
}
}