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

ipa: ipu3: af: Remove redundant memcpy

Browse source 
The af statistics can be accessed directly from the mapped buffer.
Remove the redundant memcpy, and simplify the call to
afEstimateVariance().

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:39:16 +00:00
parent 3067203325
commit 9366dd6d12
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -354,7 +354,7 @@ void Af::afIgnoreFrameReset()
* *
* \return The variance of the values in the data set \a y_item selected by \a isY1 * \return The variance of the values in the data set \a y_item selected by \a isY1
*/ */
double Af::afEstimateVariance(y_table_item_t *y_item, uint32_t len, double Af::afEstimateVariance(const y_table_item_t *y_item, uint32_t len,
bool isY1) bool isY1)
{ {
uint32_t z = 0; uint32_t z = 0;
@ -424,25 +424,21 @@ bool Af::afIsOutOfFocus(IPAContext context)
*/ */
void Af::process(IPAContext &context, const ipu3_uapi_stats_3a *stats) void Af::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)
{ {
y_table_item_t y_item[IPU3_UAPI_AF_Y_TABLE_MAX_SIZE / sizeof(y_table_item_t)]; const y_table_item_t *y_item = reinterpret_cast<const y_table_item_t *>(&stats->af_raw_buffer.y_table);
uint32_t afRawBufferLen; uint32_t afRawBufferLen;
/* Evaluate the AF buffer length */ /* Evaluate the AF buffer length */
afRawBufferLen = context.configuration.af.afGrid.width * afRawBufferLen = context.configuration.af.afGrid.width *
context.configuration.af.afGrid.height; context.configuration.af.afGrid.height;
memcpy(y_item, stats->af_raw_buffer.y_table, ASSERT(afRawBufferLen < IPU3_UAPI_AF_Y_TABLE_MAX_SIZE);
afRawBufferLen * sizeof(y_table_item_t));
/* /*
* Calculate the mean and the variance of AF statistics for a given grid. * Calculate the mean and the variance of AF statistics for a given grid.
* For coarse: y1 are used. * For coarse: y1 are used.
* For fine: y2 results are used. * For fine: y2 results are used.
*/ */
if (coarseCompleted_) currentVariance_ = afEstimateVariance(y_item, afRawBufferLen, !coarseCompleted_);
currentVariance_ = afEstimateVariance(y_item, afRawBufferLen, false);
else
currentVariance_ = afEstimateVariance(y_item, afRawBufferLen, true);
if (!context.frameContext.af.stable) { if (!context.frameContext.af.stable) {
afCoarseScan(context); afCoarseScan(context);

2
src/ipa/ipu3/algorithms/af.h
View file

@ -41,7 +41,7 @@ private:
void afReset(IPAContext &context); void afReset(IPAContext &context);
bool afNeedIgnoreFrame(); bool afNeedIgnoreFrame();
void afIgnoreFrameReset(); void afIgnoreFrameReset();
double afEstimateVariance(y_table_item_t *y_item, uint32_t len, double afEstimateVariance(const y_table_item_t *y_item, uint32_t len,
bool isY1); bool isY1);
bool afIsOutOfFocus(IPAContext context); bool afIsOutOfFocus(IPAContext context);