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

ipa: libipa: algorithm: process(): Pass frame number

Browse source 
Pass the frame number of the current frame being processed.

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:07 +01:00 • committed by Laurent Pinchart
parent 87d36de543
commit 494662f082
16 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ipa/ipu3/algorithms/af.cpp
View file

@ -406,6 +406,7 @@ bool Af::afIsOutOfFocus(IPAContext &context)
/**
* \brief Determine the max contrast image and lens position.
* \param[in] context The IPA context.
* \param[in] frame The frame context sequence number
* \param[in] frameContext The current frame context
* \param[in] stats The statistics buffer of IPU3.
*
@ -420,7 +421,8 @@ bool Af::afIsOutOfFocus(IPAContext &context)
*
* [1] Hill Climbing Algorithm, https://en.wikipedia.org/wiki/Hill_climbing
*/
void Af::process(IPAContext &context, [[maybe_unused]] IPAFrameContext &frameContext,
void Af::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
const ipu3_uapi_stats_3a *stats)
{
/* Evaluate the AF buffer length */

3
src/ipa/ipu3/algorithms/af.h
View file

@ -34,7 +34,8 @@ public:
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
ipu3_uapi_params *params) override;
void process(IPAContext &context, IPAFrameContext &frameContext,
void process(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
const ipu3_uapi_stats_3a *stats) override;
private:

4
src/ipa/ipu3/algorithms/agc.cpp
View file

@ -317,13 +317,15 @@ double Agc::estimateLuminance(IPAActiveState &activeState,
/**
* \brief Process IPU3 statistics, and run AGC operations
* \param[in] context The shared IPA context
* \param[in] frame The current frame sequence number
* \param[in] frameContext The current frame context
* \param[in] stats The IPU3 statistics and ISP results
*
* Identify the current image brightness, and use that to estimate the optimal
* new exposure and gain for the scene.
*/
void Agc::process(IPAContext &context, IPAFrameContext &frameContext,
void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
IPAFrameContext &frameContext,
const ipu3_uapi_stats_3a *stats)
{
/*

3
src/ipa/ipu3/algorithms/agc.h
View file

@ -28,7 +28,8 @@ public:
~Agc() = default;
int configure(IPAContext &context, const IPAConfigInfo &configInfo) override;
void process(IPAContext &context, IPAFrameContext &frameContext,
void process(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
const ipu3_uapi_stats_3a *stats) override;
private:

3
src/ipa/ipu3/algorithms/awb.cpp
View file

@ -387,7 +387,8 @@ void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats)
/**
* \copydoc libcamera::ipa::Algorithm::process
*/
void Awb::process(IPAContext &context, [[maybe_unused]] IPAFrameContext &frameContext,
void Awb::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
const ipu3_uapi_stats_3a *stats)
{
calculateWBGains(stats);

3
src/ipa/ipu3/algorithms/awb.h
View file

@ -42,7 +42,8 @@ public:
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
ipu3_uapi_params *params) override;
void process(IPAContext &context, IPAFrameContext &frameContext,
void process(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
const ipu3_uapi_stats_3a *stats) override;
private:

4
src/ipa/ipu3/algorithms/tone_mapping.cpp
View file

@ -76,13 +76,15 @@ void ToneMapping::prepare([[maybe_unused]] IPAContext &context,
/**
* \brief Calculate the tone mapping look up table
* \param[in] context The shared IPA context
* \param[in] frame The current frame sequence number
* \param[in] frameContext The current frame context
* \param[in] stats The IPU3 statistics and ISP results
*
* The tone mapping look up table is generated as an inverse power curve from
* our gamma setting.
*/
void ToneMapping::process(IPAContext &context, [[maybe_unused]] IPAFrameContext &frameContext,
void ToneMapping::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
[[maybe_unused]] const ipu3_uapi_stats_3a *stats)
{
/*

3
src/ipa/ipu3/algorithms/tone_mapping.h
View file

@ -21,7 +21,8 @@ public:
int configure(IPAContext &context, const IPAConfigInfo &configInfo) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext, ipu3_uapi_params *params) override;
void process(IPAContext &context, IPAFrameContext &frameContext,
void process(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
const ipu3_uapi_stats_3a *stats) override;
private:

2
src/ipa/ipu3/ipu3.cpp
View file

@ -618,7 +618,7 @@ void IPAIPU3::processStatsBuffer(const uint32_t frame,
ControlList ctrls(controls::controls);
for (auto const &algo : algorithms())
algo->process(context_, frameContext, stats);
algo->process(context_, frame, frameContext, stats);
setControls(frame);

1
src/ipa/libipa/algorithm.cpp
View file

@ -103,6 +103,7 @@ namespace ipa {
* \fn Algorithm::process()
* \brief Process ISP statistics, and run algorithm operations
* \param[in] context The shared IPA context
* \param[in] frame The frame context sequence number
* \param[in] frameContext The current frame's context
* \param[in] stats The IPA statistics and ISP results
*

1
src/ipa/libipa/algorithm.h
View file

@ -52,6 +52,7 @@ public:
}
virtual void process([[maybe_unused]] typename Module::Context &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] typename Module::FrameContext &frameContext,
[[maybe_unused]] const typename Module::Stats *stats)
{

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

@ -275,13 +275,14 @@ double Agc::measureBrightness(const rkisp1_cif_isp_hist_stat *hist) const
/**
* \brief Process RkISP1 statistics, and run AGC operations
* \param[in] context The shared IPA context
* \param[in] frame The frame context sequence number
* \param[in] frameContext The current frame context
* \param[in] stats The RKISP1 statistics and ISP results
*
* Identify the current image brightness, and use that to estimate the optimal
* new exposure and gain for the scene.
*/
void Agc::process(IPAContext &context,
void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
const rkisp1_stat_buffer *stats)
{

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

@ -29,7 +29,8 @@ public:
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
rkisp1_params_cfg *params) override;
void process(IPAContext &context, IPAFrameContext &frameContext,
void process(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
const rkisp1_stat_buffer *stats) override;
private:

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

@ -155,6 +155,7 @@ void Awb::queueRequest(IPAContext &context,
* \copydoc libcamera::ipa::Algorithm::process
*/
void Awb::process([[maybe_unused]] IPAContext &context,
[[maybe_unused]] const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameCtx,
const rkisp1_stat_buffer *stats)
{

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

@ -25,7 +25,8 @@ public:
rkisp1_params_cfg *params) override;
void queueRequest(IPAContext &context, const uint32_t frame,
const ControlList &controls) override;
void process(IPAContext &context, IPAFrameContext &frameCtx,
void process(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameCtx,
const rkisp1_stat_buffer *stats) override;
private:

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

@ -332,7 +332,7 @@ void IPARkISP1::processStatsBuffer(const uint32_t frame, const uint32_t bufferId
IPAFrameContext frameContext;
for (auto const &algo : algorithms())
algo->process(context_, frameContext, stats);
algo->process(context_, frame, frameContext, stats);
setControls(frame);