[libcamera-devel,v2,2/5] ipa: ipu3: af: Use geometry classes to perform grid centering
diff mbox series

Message ID 20220323135614.865252-3-kieran.bingham@ideasonboard.com
State Superseded
Headers show
Series
  • ipa: ipu3: af: Small improvements
Related show

Commit Message

Kieran Bingham March 23, 2022, 1:56 p.m. UTC 
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>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/ipa/ipu3/algorithms/af.cpp | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

Patch
diff mbox series 

diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp
index 634d0f2e3176..f5a489412a9e 100644
--- a/src/ipa/ipu3/algorithms/af.cpp
+++ b/src/ipa/ipu3/algorithms/af.cpp
@@ -141,16 +141,23 @@  int Af::configure(IPAContext &context, const IPAConfigInfo &configInfo)
 	grid.block_height_log2 = kAfMinGridBlockHeight;
 	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;