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

ipa: rkisp1: dpf: Store per-frame information in frame context

Browse source 
Rework the algorithm's usage of the active state, to store the value of
controls for the last queued request in the queueRequest() function, and
store a copy of the values in the corresponding frame context. The
latter is used in the prepare() function to populate the ISP parameters
with values corresponding to the right frame.

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:
Laurent Pinchart 2022-09-08 00:39:53 +03:00
parent cb08adffe2
commit 3c3e0aa123
3 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/ipa/rkisp1/algorithms/dpf.cpp
View file

@ -176,10 +176,11 @@ int Dpf::init([[maybe_unused]] IPAContext &context,
*/
void Dpf::queueRequest(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
IPAFrameContext &frameContext,
const ControlList &controls)
{
auto &dpf = context.activeState.dpf;
bool update = false;
const auto &denoise = controls.get(controls::draft::NoiseReductionMode);
if (denoise) {
@ -187,35 +188,40 @@ void Dpf::queueRequest(IPAContext &context,
switch (*denoise) {
case controls::draft::NoiseReductionModeOff:
dpf.denoise = false;
dpf.updateParams = true;
if (dpf.denoise) {
dpf.denoise = false;
update = true;
}
break;
case controls::draft::NoiseReductionModeMinimal:
case controls::draft::NoiseReductionModeHighQuality:
case controls::draft::NoiseReductionModeFast:
dpf.denoise = true;
dpf.updateParams = true;
if (!dpf.denoise) {
dpf.denoise = true;
update = true;
}
break;
default:
LOG(RkISP1Dpf, Error)
<< "Unsupported denoise value "
<< *denoise;
break;
}
}
frameContext.dpf.denoise = dpf.denoise;
frameContext.dpf.update = update;
}
/**
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void Dpf::prepare(IPAContext &context, const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
IPAFrameContext &frameContext, rkisp1_params_cfg *params)
{
if (!initialized_)
return;
auto &dpf = context.activeState.dpf;
if (frame == 0) {
params->others.dpf_config = config_;
params->others.dpf_strength_config = strengthConfig_;
@ -245,12 +251,10 @@ void Dpf::prepare(IPAContext &context, const uint32_t frame,
RKISP1_CIF_ISP_MODULE_DPF_STRENGTH;
}
if (dpf.updateParams) {
if (frameContext.dpf.update) {
params->module_en_update |= RKISP1_CIF_ISP_MODULE_DPF;
if (dpf.denoise)
if (frameContext.dpf.denoise)
params->module_ens |= RKISP1_CIF_ISP_MODULE_DPF;
dpf.updateParams = false;
}
}