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

32
include/linux/intel-ipu3.h
View file

@ -59,17 +59,39 @@ struct ipu3_uapi_grid_config {
__u16 y_end;
} __attribute__((packed));
/**
* struct ipu3_uapi_awb_set_item - Memory layout for each cell in AWB
*
* @Gr_avg: Green average for red lines in the cell.
* @R_avg: Red average in the cell.
* @B_avg: Blue average in the cell.
* @Gb_avg: Green average for blue lines in the cell.
* @sat_ratio: Percentage of pixels over a given threshold set in
* ipu3_uapi_awb_config_s, coded from 0 to 255.
* @padding0: Unused byte for padding.
* @padding1: Unused byte for padding.
* @padding2: Unused byte for padding.
*/
struct ipu3_uapi_awb_set_item {
unsigned char Gr_avg;
unsigned char R_avg;
unsigned char B_avg;
unsigned char Gb_avg;
unsigned char sat_ratio;
unsigned char padding0;
unsigned char padding1;
unsigned char padding2;
} __attribute__((packed));
/*
* The grid based data is divided into "slices" called set, each slice of setX
* refers to ipu3_uapi_grid_config width * height_per_slice.
*/
#define IPU3_UAPI_AWB_MAX_SETS 60
/* Based on grid size 80 * 60 and cell size 16 x 16 */
#define IPU3_UAPI_AWB_SET_SIZE 1280
#define IPU3_UAPI_AWB_MD_ITEM_SIZE 8
#define IPU3_UAPI_AWB_SET_SIZE 160
#define IPU3_UAPI_AWB_SPARE_FOR_BUBBLES \
(IPU3_UAPI_MAX_BUBBLE_SIZE * IPU3_UAPI_MAX_STRIPES * \
IPU3_UAPI_AWB_MD_ITEM_SIZE)
(IPU3_UAPI_MAX_BUBBLE_SIZE * IPU3_UAPI_MAX_STRIPES)
#define IPU3_UAPI_AWB_MAX_BUFFER_SIZE \
(IPU3_UAPI_AWB_MAX_SETS * \
(IPU3_UAPI_AWB_SET_SIZE + IPU3_UAPI_AWB_SPARE_FOR_BUBBLES))
@ -82,7 +104,7 @@ struct ipu3_uapi_grid_config {
* the average values for each color channel.
*/
struct ipu3_uapi_awb_raw_buffer {
__u8 meta_data[IPU3_UAPI_AWB_MAX_BUFFER_SIZE]
struct ipu3_uapi_awb_set_item meta_data[IPU3_UAPI_AWB_MAX_BUFFER_SIZE]
__attribute__((aligned(32)));
} __attribute__((packed));