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

ipa: rkisp1: Remove initialized_ flags from algorithms

Browse source 
Multiple algorithms have an initialized_ flag that they set to true at
the end of the init() function, and check at the beginning of prepare()
to skip preparation. This serves no real purpose, as the flag can only
be false if init() fails, in which case the IPA module initialization as
a whole will fail.

Drop the initialized_ flags.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2022-09-30 04:08:47 +03:00
parent c97cf467ea
commit 79f0fc937d
8 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ipa/rkisp1/algorithms/dpcc.cpp
View file

@ -37,7 +37,7 @@ namespace ipa::rkisp1::algorithms {
LOG_DEFINE_CATEGORY(RkISP1Dpcc)
DefectPixelClusterCorrection::DefectPixelClusterCorrection()
: initialized_(false), config_({})
: config_({})
{
}
@ -223,8 +223,6 @@ int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context,
}
}
initialized_ = true;
return 0;
}
@ -239,9 +237,6 @@ void DefectPixelClusterCorrection::prepare([[maybe_unused]] IPAContext &context,
if (frame > 0)
return;
if (!initialized_)
return;
params->others.dpcc_config = config_;
params->module_en_update |= RKISP1_CIF_ISP_MODULE_DPCC;

1
src/ipa/rkisp1/algorithms/dpcc.h
View file

@ -25,7 +25,6 @@ public:
rkisp1_params_cfg *params) override;
private:
bool initialized_;
rkisp1_cif_isp_dpcc_config config_;
};

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

@ -35,7 +35,7 @@ namespace ipa::rkisp1::algorithms {
LOG_DEFINE_CATEGORY(RkISP1Dpf)
Dpf::Dpf()
: initialized_(false), config_({}), strengthConfig_({})
: config_({}), strengthConfig_({})
{
}
@ -166,8 +166,6 @@ int Dpf::init([[maybe_unused]] IPAContext &context,
strengthConfig_.g = fSObject["g"].get<uint16_t>(64);
strengthConfig_.b = fSObject["b"].get<uint16_t>(64);
initialized_ = true;
return 0;
}
@ -219,9 +217,6 @@ void Dpf::queueRequest(IPAContext &context,
void Dpf::prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext, rkisp1_params_cfg *params)
{
if (!initialized_)
return;
if (frame == 0) {
params->others.dpf_config = config_;
params->others.dpf_strength_config = strengthConfig_;

1
src/ipa/rkisp1/algorithms/dpf.h
View file

@ -30,7 +30,6 @@ public:
rkisp1_params_cfg *params) override;
private:
bool initialized_;
struct rkisp1_cif_isp_dpf_config config_;
struct rkisp1_cif_isp_dpf_strength_config strengthConfig_;
};

5
src/ipa/rkisp1/algorithms/gsl.cpp
View file

@ -49,7 +49,6 @@ LOG_DEFINE_CATEGORY(RkISP1Gsl)
static constexpr unsigned int kDegammaXIntervals = 16;
GammaSensorLinearization::GammaSensorLinearization()
: initialized_(false)
{
}
@ -111,7 +110,6 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context,
return -EINVAL;
}
initialized_ = true;
return 0;
}
@ -126,9 +124,6 @@ void GammaSensorLinearization::prepare([[maybe_unused]] IPAContext &context,
if (frame > 0)
return;
if (!initialized_)
return;
params->others.sdg_config.xa_pnts.gamma_dx0 = gammaDx_[0];
params->others.sdg_config.xa_pnts.gamma_dx1 = gammaDx_[1];

1
src/ipa/rkisp1/algorithms/gsl.h
View file

@ -25,7 +25,6 @@ public:
rkisp1_params_cfg *params) override;
private:
bool initialized_;
uint32_t gammaDx_[2];
std::vector<uint16_t> curveYr_;
std::vector<uint16_t> curveYg_;

8
src/ipa/rkisp1/algorithms/lsc.cpp
View file

@ -89,7 +89,6 @@ static std::vector<uint16_t> parseTable(const YamlObject &tuningData,
}
LensShadingCorrection::LensShadingCorrection()
: initialized_(false)
{
}
@ -114,8 +113,6 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,
gbData_.empty() || bData_.empty())
return -EINVAL;
initialized_ = true;
return 0;
}
@ -125,7 +122,7 @@ int LensShadingCorrection::init([[maybe_unused]] IPAContext &context,
int LensShadingCorrection::configure(IPAContext &context,
[[maybe_unused]] const IPACameraSensorInfo &configInfo)
{
context.configuration.lsc.enabled = initialized_;
context.configuration.lsc.enabled = true;
return 0;
}
@ -139,9 +136,6 @@ void LensShadingCorrection::prepare(IPAContext &context, const uint32_t frame,
if (frame > 0)
return;
if (!initialized_)
return;
struct rkisp1_cif_isp_lsc_config &config = params->others.lsc_config;
const Size &size = context.configuration.sensor.size;
Size totalSize{};

2
src/ipa/rkisp1/algorithms/lsc.h
View file

@ -26,8 +26,6 @@ public:
rkisp1_params_cfg *params) override;
private:
bool initialized_;
std::vector<uint16_t> rData_;
std::vector<uint16_t> grData_;
std::vector<uint16_t> gbData_;