ipa: Sort algorithm operations based on calling order
Reorder functions in the base ipa::Algorithm and its derived classes to match the calling order: queueRequest(), prepare() and process(). This makes the code flow easier to read. No functional change intended. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart
parent
bc0d9a6f5d
commit
02bc2a8a24
7 changed files with 209 additions and 209 deletions
|
|
@ -107,6 +107,46 @@ int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* \copydoc libcamera::ipa::Algorithm::prepare
|
||||
*/
|
||||
void Agc::prepare(IPAContext &context, const uint32_t frame,
|
||||
IPAFrameContext &frameContext, rkisp1_params_cfg *params)
|
||||
{
|
||||
frameContext.agc.exposure = context.activeState.agc.exposure;
|
||||
frameContext.agc.gain = context.activeState.agc.gain;
|
||||
|
||||
if (frame > 0)
|
||||
return;
|
||||
|
||||
/* Configure the measurement window. */
|
||||
params->meas.aec_config.meas_window = context.configuration.agc.measureWindow;
|
||||
/* Use a continuous method for measure. */
|
||||
params->meas.aec_config.autostop = RKISP1_CIF_ISP_EXP_CTRL_AUTOSTOP_0;
|
||||
/* Estimate Y as (R + G + B) x (85/256). */
|
||||
params->meas.aec_config.mode = RKISP1_CIF_ISP_EXP_MEASURING_MODE_1;
|
||||
|
||||
params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_AEC;
|
||||
params->module_ens |= RKISP1_CIF_ISP_MODULE_AEC;
|
||||
params->module_en_update |= RKISP1_CIF_ISP_MODULE_AEC;
|
||||
|
||||
/* Configure histogram. */
|
||||
params->meas.hst_config.meas_window = context.configuration.agc.measureWindow;
|
||||
/* Produce the luminance histogram. */
|
||||
params->meas.hst_config.mode = RKISP1_CIF_ISP_HISTOGRAM_MODE_Y_HISTOGRAM;
|
||||
/* Set an average weighted histogram. */
|
||||
for (unsigned int histBin = 0; histBin < numHistBins_; histBin++)
|
||||
params->meas.hst_config.hist_weight[histBin] = 1;
|
||||
/* Step size can't be less than 3. */
|
||||
params->meas.hst_config.histogram_predivider = 4;
|
||||
|
||||
/* Update the configuration for histogram. */
|
||||
params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_HST;
|
||||
/* Enable the histogram measure unit. */
|
||||
params->module_ens |= RKISP1_CIF_ISP_MODULE_HST;
|
||||
params->module_en_update |= RKISP1_CIF_ISP_MODULE_HST;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Apply a filter on the exposure value to limit the speed of changes
|
||||
* \param[in] exposureValue The target exposure from the AGC algorithm
|
||||
|
|
@ -348,46 +388,6 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
|
|||
metadata.set(controls::FrameDuration, frameDuration.get<std::micro>());
|
||||
}
|
||||
|
||||
/**
|
||||
* \copydoc libcamera::ipa::Algorithm::prepare
|
||||
*/
|
||||
void Agc::prepare(IPAContext &context, const uint32_t frame,
|
||||
IPAFrameContext &frameContext, rkisp1_params_cfg *params)
|
||||
{
|
||||
frameContext.agc.exposure = context.activeState.agc.exposure;
|
||||
frameContext.agc.gain = context.activeState.agc.gain;
|
||||
|
||||
if (frame > 0)
|
||||
return;
|
||||
|
||||
/* Configure the measurement window. */
|
||||
params->meas.aec_config.meas_window = context.configuration.agc.measureWindow;
|
||||
/* Use a continuous method for measure. */
|
||||
params->meas.aec_config.autostop = RKISP1_CIF_ISP_EXP_CTRL_AUTOSTOP_0;
|
||||
/* Estimate Y as (R + G + B) x (85/256). */
|
||||
params->meas.aec_config.mode = RKISP1_CIF_ISP_EXP_MEASURING_MODE_1;
|
||||
|
||||
params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_AEC;
|
||||
params->module_ens |= RKISP1_CIF_ISP_MODULE_AEC;
|
||||
params->module_en_update |= RKISP1_CIF_ISP_MODULE_AEC;
|
||||
|
||||
/* Configure histogram. */
|
||||
params->meas.hst_config.meas_window = context.configuration.agc.measureWindow;
|
||||
/* Produce the luminance histogram. */
|
||||
params->meas.hst_config.mode = RKISP1_CIF_ISP_HISTOGRAM_MODE_Y_HISTOGRAM;
|
||||
/* Set an average weighted histogram. */
|
||||
for (unsigned int histBin = 0; histBin < numHistBins_; histBin++)
|
||||
params->meas.hst_config.hist_weight[histBin] = 1;
|
||||
/* Step size can't be less than 3. */
|
||||
params->meas.hst_config.histogram_predivider = 4;
|
||||
|
||||
/* Update the configuration for histogram. */
|
||||
params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_HST;
|
||||
/* Enable the histogram measure unit. */
|
||||
params->module_ens |= RKISP1_CIF_ISP_MODULE_HST;
|
||||
params->module_en_update |= RKISP1_CIF_ISP_MODULE_HST;
|
||||
}
|
||||
|
||||
REGISTER_IPA_ALGORITHM(Agc, "Agc")
|
||||
|
||||
} /* namespace ipa::rkisp1::algorithms */
|
||||
|
|
|
|||
|
|
@ -67,20 +67,41 @@ int Awb::configure(IPAContext &context,
|
|||
return 0;
|
||||
}
|
||||
|
||||
uint32_t Awb::estimateCCT(double red, double green, double blue)
|
||||
/**
|
||||
* \copydoc libcamera::ipa::Algorithm::queueRequest
|
||||
*/
|
||||
void Awb::queueRequest(IPAContext &context,
|
||||
[[maybe_unused]] const uint32_t frame,
|
||||
IPAFrameContext &frameContext,
|
||||
const ControlList &controls)
|
||||
{
|
||||
/* Convert the RGB values to CIE tristimulus values (XYZ) */
|
||||
double X = (-0.14282) * (red) + (1.54924) * (green) + (-0.95641) * (blue);
|
||||
double Y = (-0.32466) * (red) + (1.57837) * (green) + (-0.73191) * (blue);
|
||||
double Z = (-0.68202) * (red) + (0.77073) * (green) + (0.56332) * (blue);
|
||||
auto &awb = context.activeState.awb;
|
||||
|
||||
/* Calculate the normalized chromaticity values */
|
||||
double x = X / (X + Y + Z);
|
||||
double y = Y / (X + Y + Z);
|
||||
const auto &awbEnable = controls.get(controls::AwbEnable);
|
||||
if (awbEnable && *awbEnable != awb.autoEnabled) {
|
||||
awb.autoEnabled = *awbEnable;
|
||||
|
||||
/* Calculate CCT */
|
||||
double n = (x - 0.3320) / (0.1858 - y);
|
||||
return 449 * n * n * n + 3525 * n * n + 6823.3 * n + 5520.33;
|
||||
LOG(RkISP1Awb, Debug)
|
||||
<< (*awbEnable ? "Enabling" : "Disabling") << " AWB";
|
||||
}
|
||||
|
||||
const auto &colourGains = controls.get(controls::ColourGains);
|
||||
if (colourGains && !awb.autoEnabled) {
|
||||
awb.gains.manual.red = (*colourGains)[0];
|
||||
awb.gains.manual.blue = (*colourGains)[1];
|
||||
|
||||
LOG(RkISP1Awb, Debug)
|
||||
<< "Set colour gains to red: " << awb.gains.manual.red
|
||||
<< ", blue: " << awb.gains.manual.blue;
|
||||
}
|
||||
|
||||
frameContext.awb.autoEnabled = awb.autoEnabled;
|
||||
|
||||
if (!awb.autoEnabled) {
|
||||
frameContext.awb.gains.red = awb.gains.manual.red;
|
||||
frameContext.awb.gains.green = 1.0;
|
||||
frameContext.awb.gains.blue = awb.gains.manual.blue;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -165,41 +186,20 @@ void Awb::prepare(IPAContext &context, const uint32_t frame,
|
|||
params->module_ens |= RKISP1_CIF_ISP_MODULE_AWB;
|
||||
}
|
||||
|
||||
/**
|
||||
* \copydoc libcamera::ipa::Algorithm::queueRequest
|
||||
*/
|
||||
void Awb::queueRequest(IPAContext &context,
|
||||
[[maybe_unused]] const uint32_t frame,
|
||||
IPAFrameContext &frameContext,
|
||||
const ControlList &controls)
|
||||
uint32_t Awb::estimateCCT(double red, double green, double blue)
|
||||
{
|
||||
auto &awb = context.activeState.awb;
|
||||
/* Convert the RGB values to CIE tristimulus values (XYZ) */
|
||||
double X = (-0.14282) * (red) + (1.54924) * (green) + (-0.95641) * (blue);
|
||||
double Y = (-0.32466) * (red) + (1.57837) * (green) + (-0.73191) * (blue);
|
||||
double Z = (-0.68202) * (red) + (0.77073) * (green) + (0.56332) * (blue);
|
||||
|
||||
const auto &awbEnable = controls.get(controls::AwbEnable);
|
||||
if (awbEnable && *awbEnable != awb.autoEnabled) {
|
||||
awb.autoEnabled = *awbEnable;
|
||||
/* Calculate the normalized chromaticity values */
|
||||
double x = X / (X + Y + Z);
|
||||
double y = Y / (X + Y + Z);
|
||||
|
||||
LOG(RkISP1Awb, Debug)
|
||||
<< (*awbEnable ? "Enabling" : "Disabling") << " AWB";
|
||||
}
|
||||
|
||||
const auto &colourGains = controls.get(controls::ColourGains);
|
||||
if (colourGains && !awb.autoEnabled) {
|
||||
awb.gains.manual.red = (*colourGains)[0];
|
||||
awb.gains.manual.blue = (*colourGains)[1];
|
||||
|
||||
LOG(RkISP1Awb, Debug)
|
||||
<< "Set colour gains to red: " << awb.gains.manual.red
|
||||
<< ", blue: " << awb.gains.manual.blue;
|
||||
}
|
||||
|
||||
frameContext.awb.autoEnabled = awb.autoEnabled;
|
||||
|
||||
if (!awb.autoEnabled) {
|
||||
frameContext.awb.gains.red = awb.gains.manual.red;
|
||||
frameContext.awb.gains.green = 1.0;
|
||||
frameContext.awb.gains.blue = awb.gains.manual.blue;
|
||||
}
|
||||
/* Calculate CCT */
|
||||
double n = (x - 0.3320) / (0.1858 - y);
|
||||
return 449 * n * n * n + 3525 * n * n + 6823.3 * n + 5520.33;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@ public:
|
|||
~Awb() = default;
|
||||
|
||||
int configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;
|
||||
void prepare(IPAContext &context, const uint32_t frame,
|
||||
IPAFrameContext &frameContext,
|
||||
rkisp1_params_cfg *params) override;
|
||||
void queueRequest(IPAContext &context, const uint32_t frame,
|
||||
IPAFrameContext &frameContext,
|
||||
const ControlList &controls) override;
|
||||
void prepare(IPAContext &context, const uint32_t frame,
|
||||
IPAFrameContext &frameContext,
|
||||
rkisp1_params_cfg *params) override;
|
||||
void process(IPAContext &context, const uint32_t frame,
|
||||
IPAFrameContext &frameContext,
|
||||
const rkisp1_stat_buffer *stats,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue