mirror of
https://git.libcamera.org/libcamera/libcamera.git
synced 2025-07-15 16:35:06 +03:00
ipa: rkisp1: Fill AGC and AWB metadata
Fill the frame metadata in the AGC and AWB algorithm's prepare() function. Additional metadata for other algorithms will be addressed later. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
parent
c20ca6587d
commit
32d5f0d2a4
5 changed files with 28 additions and 2 deletions
|
@ -14,6 +14,7 @@
|
|||
#include <libcamera/base/log.h>
|
||||
#include <libcamera/base/utils.h>
|
||||
|
||||
#include <libcamera/control_ids.h>
|
||||
#include <libcamera/ipa/core_ipa_interface.h>
|
||||
|
||||
#include "libipa/histogram.h"
|
||||
|
@ -290,7 +291,7 @@ double Agc::measureBrightness(const rkisp1_cif_isp_hist_stat *hist) const
|
|||
*/
|
||||
void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
|
||||
IPAFrameContext &frameContext, const rkisp1_stat_buffer *stats,
|
||||
[[maybe_unused]] ControlList &metadata)
|
||||
ControlList &metadata)
|
||||
{
|
||||
/*
|
||||
* \todo Verify that the exposure and gain applied by the sensor for
|
||||
|
@ -333,6 +334,18 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
|
|||
|
||||
computeExposure(context, frameContext, yGain, iqMeanGain);
|
||||
frameCount_++;
|
||||
|
||||
utils::Duration exposureTime = context.configuration.sensor.lineDuration
|
||||
* frameContext.sensor.exposure;
|
||||
metadata.set(controls::AnalogueGain, frameContext.sensor.gain);
|
||||
metadata.set(controls::ExposureTime, exposureTime.get<std::micro>());
|
||||
|
||||
/* \todo Use VBlank value calculated from each frame exposure. */
|
||||
uint32_t vTotal = context.configuration.sensor.size.height
|
||||
+ context.configuration.sensor.defVBlank;
|
||||
utils::Duration frameDuration = context.configuration.sensor.lineDuration
|
||||
* vTotal;
|
||||
metadata.set(controls::FrameDuration, frameDuration.get<std::micro>());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -209,7 +209,7 @@ void Awb::process(IPAContext &context,
|
|||
[[maybe_unused]] const uint32_t frame,
|
||||
IPAFrameContext &frameContext,
|
||||
const rkisp1_stat_buffer *stats,
|
||||
[[maybe_unused]] ControlList &metadata)
|
||||
ControlList &metadata)
|
||||
{
|
||||
const rkisp1_cif_isp_stat *params = &stats->params;
|
||||
const rkisp1_cif_isp_awb_stat *awb = ¶ms->awb;
|
||||
|
@ -307,6 +307,13 @@ void Awb::process(IPAContext &context,
|
|||
|
||||
frameContext.awb.temperatureK = activeState.awb.temperatureK;
|
||||
|
||||
metadata.set(controls::AwbEnable, frameContext.awb.autoEnabled);
|
||||
metadata.set(controls::ColourGains, {
|
||||
static_cast<float>(frameContext.awb.gains.red),
|
||||
static_cast<float>(frameContext.awb.gains.blue)
|
||||
});
|
||||
metadata.set(controls::ColourTemperature, frameContext.awb.temperatureK);
|
||||
|
||||
LOG(RkISP1Awb, Debug) << std::showpoint
|
||||
<< "Means [" << redMean << ", " << greenMean << ", " << blueMean
|
||||
<< "], gains [" << activeState.awb.gains.automatic.red << ", "
|
||||
|
|
|
@ -77,6 +77,9 @@ namespace libcamera::ipa::rkisp1 {
|
|||
* \var IPASessionConfiguration::sensor
|
||||
* \brief Sensor-specific configuration of the IPA
|
||||
*
|
||||
* \var IPASessionConfiguration::sensor.defVBlank
|
||||
* \brief The default vblank value of the sensor
|
||||
*
|
||||
* \var IPASessionConfiguration::sensor.lineDuration
|
||||
* \brief Line duration in microseconds
|
||||
*
|
||||
|
|
|
@ -39,6 +39,7 @@ struct IPASessionConfiguration {
|
|||
} lsc;
|
||||
|
||||
struct {
|
||||
int32_t defVBlank;
|
||||
utils::Duration lineDuration;
|
||||
Size size;
|
||||
} sensor;
|
||||
|
|
|
@ -244,6 +244,8 @@ int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,
|
|||
/* Set the hardware revision for the algorithms. */
|
||||
context_.configuration.hw.revision = hwRevision_;
|
||||
|
||||
const ControlInfo vBlank = ctrls_.find(V4L2_CID_VBLANK)->second;
|
||||
context_.configuration.sensor.defVBlank = vBlank.def().get<int32_t>();
|
||||
context_.configuration.sensor.size = info.outputSize;
|
||||
context_.configuration.sensor.lineDuration = info.minLineLength * 1.0s / info.pixelRate;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue