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

ipa: ipu3: agc: remove local storage of the grid

Browse source 
The IPASessionConfiguration now has the grid configuration stored. Use
it at process() call in AGC and pass it as a reference to the private
functions when needed.

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Jean-Michel Hautbois 2021-08-20 14:02:58 +02:00
parent e991bb2c36
commit b3befe2ef0
2 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,10 +57,9 @@ Agc::Agc()
{ {
} }
int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo) int Agc::configure([[maybe_unused]] IPAContext &context,
const IPAConfigInfo &configInfo)
{ {
aeGrid_ = context.configuration.grid.bdsGrid;
lineDuration_ = configInfo.sensorInfo.lineLength * 1.0s lineDuration_ = configInfo.sensorInfo.lineLength * 1.0s
/ configInfo.sensorInfo.pixelRate; / configInfo.sensorInfo.pixelRate;
maxExposureTime_ = kMaxExposure * lineDuration_; maxExposureTime_ = kMaxExposure * lineDuration_;
@ -68,7 +67,8 @@ int Agc::configure(IPAContext &context, const IPAConfigInfo &configInfo)
return 0; return 0;
} }
void Agc::processBrightness(const ipu3_uapi_stats_3a *stats) void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,
const ipu3_uapi_grid_config &grid)
{ {
const struct ipu3_uapi_grid_config statsAeGrid = stats->stats_4a_config.awb_config.grid; const struct ipu3_uapi_grid_config statsAeGrid = stats->stats_4a_config.awb_config.grid;
Rectangle aeRegion = { statsAeGrid.x_start, Rectangle aeRegion = { statsAeGrid.x_start,
@ -76,19 +76,19 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats)
static_cast<unsigned int>(statsAeGrid.x_end - statsAeGrid.x_start) + 1, static_cast<unsigned int>(statsAeGrid.x_end - statsAeGrid.x_start) + 1,
static_cast<unsigned int>(statsAeGrid.y_end - statsAeGrid.y_start) + 1 }; static_cast<unsigned int>(statsAeGrid.y_end - statsAeGrid.y_start) + 1 };
Point topleft = aeRegion.topLeft(); Point topleft = aeRegion.topLeft();
int topleftX = topleft.x >> aeGrid_.block_width_log2; int topleftX = topleft.x >> grid.block_width_log2;
int topleftY = topleft.y >> aeGrid_.block_height_log2; int topleftY = topleft.y >> grid.block_height_log2;
/* Align to the grid cell width and height */ /* Align to the grid cell width and height */
uint32_t startX = topleftX << aeGrid_.block_width_log2; uint32_t startX = topleftX << grid.block_width_log2;
uint32_t startY = topleftY * aeGrid_.width << aeGrid_.block_width_log2; uint32_t startY = topleftY * grid.width << grid.block_width_log2;
uint32_t endX = (startX + (aeRegion.size().width >> aeGrid_.block_width_log2)) << aeGrid_.block_width_log2; uint32_t endX = (startX + (aeRegion.size().width >> grid.block_width_log2)) << grid.block_width_log2;
uint32_t i, j; uint32_t i, j;
uint32_t count = 0; uint32_t count = 0;
uint32_t hist[knumHistogramBins] = { 0 }; uint32_t hist[knumHistogramBins] = { 0 };
for (j = topleftY; for (j = topleftY;
j < topleftY + (aeRegion.size().height >> aeGrid_.block_height_log2); j < topleftY + (aeRegion.size().height >> grid.block_height_log2);
j++) { j++) {
for (i = startX + startY; i < endX + startY; i += kCellSize) { for (i = startX + startY; i < endX + startY; i += kCellSize) {
/* /*
@ -96,9 +96,9 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats)
* We observed a bit shift which makes the value 160 to be 32 in the stats grid. * We observed a bit shift which makes the value 160 to be 32 in the stats grid.
* Use the one passed at init time. * Use the one passed at init time.
*/ */
if (stats->awb_raw_buffer.meta_data[i + 4 + j * aeGrid_.width] == 0) { if (stats->awb_raw_buffer.meta_data[i + 4 + j * grid.width] == 0) {
uint8_t Gr = stats->awb_raw_buffer.meta_data[i + 0 + j * aeGrid_.width]; uint8_t Gr = stats->awb_raw_buffer.meta_data[i + 0 + j * grid.width];
uint8_t Gb = stats->awb_raw_buffer.meta_data[i + 3 + j * aeGrid_.width]; uint8_t Gb = stats->awb_raw_buffer.meta_data[i + 3 + j * grid.width];
hist[(Gr + Gb) / 2]++; hist[(Gr + Gb) / 2]++;
count++; count++;
} }
@ -190,7 +190,7 @@ void Agc::process(IPAContext &context, const ipu3_uapi_stats_3a *stats)
{ {
uint32_t &exposure = context.frameContext.agc.exposure; uint32_t &exposure = context.frameContext.agc.exposure;
double &gain = context.frameContext.agc.gain; double &gain = context.frameContext.agc.gain;
processBrightness(stats); processBrightness(stats, context.configuration.grid.bdsGrid);
lockExposureGain(exposure, gain); lockExposureGain(exposure, gain);
frameCount_++; frameCount_++;
} }

5
src/ipa/ipu3/algorithms/agc.h
View file

@ -33,12 +33,11 @@ public:
void process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override; void process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override;
private: private:
void processBrightness(const ipu3_uapi_stats_3a *stats); void processBrightness(const ipu3_uapi_stats_3a *stats,
const ipu3_uapi_grid_config &grid);
void filterExposure(); void filterExposure();
void lockExposureGain(uint32_t &exposure, double &gain); void lockExposureGain(uint32_t &exposure, double &gain);
struct ipu3_uapi_grid_config aeGrid_;
uint64_t frameCount_; uint64_t frameCount_;
uint64_t lastFrame_; uint64_t lastFrame_;