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

ipa: libipa: algorithm: prepare(): Pass frame and frame Context

Browse source 
Pass the current frame number, and the current FrameContext for calls to
prepare.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
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:
Kieran Bingham 2022-07-21 13:13:06 +01:00 • committed by Laurent Pinchart
parent ef447647b6
commit 87d36de543
30 changed files with 92 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -323,7 +323,10 @@ void Agc::process(IPAContext &context,
/**
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void Agc::prepare(IPAContext &context, rkisp1_params_cfg *params)
void Agc::prepare(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
if (context.frameContext.frameCount > 0)
return;

4
src/ipa/rkisp1/algorithms/agc.h
View file

@ -26,7 +26,9 @@ public:
~Agc() = default;
int configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
void process(IPAContext &context, IPAFrameContext &frameContext,
const rkisp1_stat_buffer *stats) override;

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

@ -74,7 +74,10 @@ uint32_t Awb::estimateCCT(double red, double green, double blue)
/**
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void Awb::prepare(IPAContext &context, rkisp1_params_cfg *params)
void Awb::prepare(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
params->others.awb_gain_config.gain_green_b = 256 * context.frameContext.awb.gains.green;
params->others.awb_gain_config.gain_blue = 256 * context.frameContext.awb.gains.blue;

4
src/ipa/rkisp1/algorithms/awb.h
View file

@ -20,7 +20,9 @@ public:
~Awb() = default;
int configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
void queueRequest(IPAContext &context, const uint32_t frame,
const ControlList &controls) override;
void process(IPAContext &context, IPAFrameContext &frameCtx,

2
src/ipa/rkisp1/algorithms/blc.cpp
View file

@ -66,6 +66,8 @@ int BlackLevelCorrection::init([[maybe_unused]] IPAContext &context,
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void BlackLevelCorrection::prepare(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
if (context.frameContext.frameCount > 0)

4
src/ipa/rkisp1/algorithms/blc.h
View file

@ -20,7 +20,9 @@ public:
~BlackLevelCorrection() = default;
int init(IPAContext &context, const YamlObject &tuningData) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
private:
bool tuningParameters_;

2
src/ipa/rkisp1/algorithms/cproc.cpp
View file

@ -71,6 +71,8 @@ void ColorProcessing::queueRequest(IPAContext &context,
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void ColorProcessing::prepare(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
auto &cproc = context.frameContext.cproc;

4
src/ipa/rkisp1/algorithms/cproc.h
View file

@ -23,7 +23,9 @@ public:
void queueRequest(IPAContext &context, const uint32_t frame,
const ControlList &controls) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
};
} /* namespace ipa::rkisp1::algorithms */

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

@ -232,6 +232,8 @@ int DefectPixelClusterCorrection::init([[maybe_unused]] IPAContext &context,
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void DefectPixelClusterCorrection::prepare(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
if (context.frameContext.frameCount > 0)

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

@ -20,7 +20,9 @@ public:
~DefectPixelClusterCorrection() = default;
int init(IPAContext &context, const YamlObject &tuningData) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
private:
bool initialized_;

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

@ -206,7 +206,9 @@ void Dpf::queueRequest(IPAContext &context,
/**
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void Dpf::prepare(IPAContext &context, rkisp1_params_cfg *params)
void Dpf::prepare(IPAContext &context, [[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
if (!initialized_)
return;

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

@ -24,7 +24,9 @@ public:
int init(IPAContext &context, const YamlObject &tuningData) override;
void queueRequest(IPAContext &context, const uint32_t frame,
const ControlList &controls) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
private:
bool initialized_;

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

@ -85,7 +85,10 @@ void Filter::queueRequest(IPAContext &context,
/**
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void Filter::prepare(IPAContext &context, rkisp1_params_cfg *params)
void Filter::prepare(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
auto &filter = context.frameContext.filter;

4
src/ipa/rkisp1/algorithms/filter.h
View file

@ -23,7 +23,9 @@ public:
void queueRequest(IPAContext &context, const uint32_t frame,
const ControlList &controls) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
};
} /* namespace ipa::rkisp1::algorithms */

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

@ -119,6 +119,8 @@ int GammaSensorLinearization::init([[maybe_unused]] IPAContext &context,
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void GammaSensorLinearization::prepare(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
if (context.frameContext.frameCount > 0)

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

@ -20,7 +20,9 @@ public:
~GammaSensorLinearization() = default;
int init(IPAContext &context, const YamlObject &tuningData) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
private:
bool initialized_;

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

@ -133,6 +133,8 @@ int LensShadingCorrection::configure(IPAContext &context,
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void LensShadingCorrection::prepare(IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
rkisp1_params_cfg *params)
{
if (context.frameContext.frameCount > 0)

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

@ -21,7 +21,9 @@ public:
int init(IPAContext &context, const YamlObject &tuningData) override;
int configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;
void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
private:
bool initialized_;