NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

ipa: ipu3: af: Use geometry classes to perform grid centering

Browse source 
Use our geometry classes for Rectangle, Size and Point to identify
the region of interest for the autofocus, and center it on the BDS output.

This will facilitate custom ROI being passed in through controls at a later
time.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Tested-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Tested-by: Kate Hsuan <hpa@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham 2022-03-15 16:11:34 +00:00
parent 50dc051fc6
commit 3067203325
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/ipa/ipu3/algorithms/af.cpp
View file

@ -160,16 +160,23 @@ int Af::configure(IPAContext &context, const IPAConfigInfo &configInfo)
grid.height_per_slice = kAfDefaultHeightPerSlice;
/* x_start and y start are default to BDS center */
grid.x_start = (configInfo.bdsOutputSize.width / 2) -
(((grid.width << grid.block_width_log2) / 2));
grid.y_start = (configInfo.bdsOutputSize.height / 2) -
(((grid.height << grid.block_height_log2) / 2));
/* Position the AF grid in the center of the BDS output. */
Rectangle bds(configInfo.bdsOutputSize);
Size gridSize(grid.width << grid.block_width_log2,
grid.height << grid.block_height_log2);
/*
* \todo - Support request metadata
* - Set the ROI based on any input controls in the request
* - Return the AF ROI as metadata in the Request
*/
Rectangle roi = gridSize.centeredTo(bds.center());
Point start = roi.topLeft();
/* x_start and y_start should be even */
grid.x_start = (grid.x_start / 2) * 2;
grid.y_start = (grid.y_start / 2) * 2;
grid.y_start = grid.y_start | IPU3_UAPI_GRID_Y_START_EN;
grid.x_start = utils::alignDown(start.x, 2);
grid.y_start = utils::alignDown(start.y, 2);
grid.y_start |= IPU3_UAPI_GRID_Y_START_EN;
/* Initial max focus step */
maxStep_ = kMaxFocusSteps;