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

ipa: rkisp1: blc: Add support for BLS in compand

Browse source 
Extend the RkISP1 BLC algorithm to use the ISP 'companding' block for
versions of the ISP (such as the one on the i.MX8MP) that lack the
dedicated BLS block but implement BLS as part of the companding block.

As access to the companding block requires the extensible parameters
format, disable BLC when using the legacy parameters format on i.MX8MP
to avoid crashes at runtime with older kernels.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>
This commit is contained in:
Paul Elder 2024-06-27 22:26:33 +09:00 • committed by Laurent Pinchart
parent 39e4e04f3a
commit 9020c2eec9
2 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,8 @@
#include "blc.h"
#include <linux/videodev2.h>
#include <libcamera/base/log.h>
#include <libcamera/control_ids.h>
@ -38,7 +40,6 @@ namespace ipa::rkisp1::algorithms {
LOG_DEFINE_CATEGORY(RkISP1Blc)
BlackLevelCorrection::BlackLevelCorrection()
: tuningParameters_(false)
{
/*
* This is a bit of a hack. In raw mode no black level correction
@ -96,8 +97,6 @@ int BlackLevelCorrection::init(IPAContext &context, const YamlObject &tuningData
blackLevelBlue_ = *blackLevel;
}
tuningParameters_ = true;
LOG(RkISP1Blc, Debug)
<< "Black levels: red " << blackLevelRed_
<< ", green (red) " << blackLevelGreenR_
@ -107,10 +106,27 @@ int BlackLevelCorrection::init(IPAContext &context, const YamlObject &tuningData
return 0;
}
int BlackLevelCorrection::configure(IPAContext &context,
[[maybe_unused]] const IPACameraSensorInfo &configInfo)
{
/*
* BLC on ISP versions that include the companding block requires usage
* of the extensible parameters format.
*/
supported_ = context.configuration.paramFormat == V4L2_META_FMT_RK_ISP1_EXT_PARAMS ||
!context.hw->compand;
if (!supported_)
LOG(RkISP1Blc, Warning)
<< "BLC in companding block requires extensible parameters";
return 0;
}
/**
* \copydoc libcamera::ipa::Algorithm::prepare
*/
void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,
void BlackLevelCorrection::prepare(IPAContext &context,
const uint32_t frame,
[[maybe_unused]] IPAFrameContext &frameContext,
RkISP1Params *params)
@ -121,18 +137,33 @@ void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,
if (frame > 0)
return;
if (!tuningParameters_)
if (!supported_)
return;
auto config = params->block<BlockType::Bls>();
config.setEnabled(true);
if (context.hw->compand) {
auto config = params->block<BlockType::CompandBls>();
config.setEnabled(true);
config->enable_auto = 0;
/* The rkisp1 uses 12bit based black levels. Scale down accordingly. */
config->fixed_val.r = blackLevelRed_ >> 4;
config->fixed_val.gr = blackLevelGreenR_ >> 4;
config->fixed_val.gb = blackLevelGreenB_ >> 4;
config->fixed_val.b = blackLevelBlue_ >> 4;
/*
* Scale up to the 20-bit black levels used by the companding
* block.
*/
config->r = blackLevelRed_ << 4;
config->gr = blackLevelGreenR_ << 4;
config->gb = blackLevelGreenB_ << 4;
config->b = blackLevelBlue_ << 4;
} else {
auto config = params->block<BlockType::Bls>();
config.setEnabled(true);
config->enable_auto = 0;
/* Scale down to the 12-bit black levels used by the BLS block. */
config->fixed_val.r = blackLevelRed_ >> 4;
config->fixed_val.gr = blackLevelGreenR_ >> 4;
config->fixed_val.gb = blackLevelGreenB_ >> 4;
config->fixed_val.b = blackLevelBlue_ >> 4;
}
}
/**

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

@ -20,6 +20,8 @@ public:
~BlackLevelCorrection() = default;
int init(IPAContext &context, const YamlObject &tuningData) override;
int configure(IPAContext &context,
const IPACameraSensorInfo &configInfo) override;
void prepare(IPAContext &context, const uint32_t frame,
IPAFrameContext &frameContext,
RkISP1Params *params) override;
@ -29,7 +31,8 @@ public:
ControlList &metadata) override;
private:
bool tuningParameters_;
bool supported_;
int16_t blackLevelRed_;
int16_t blackLevelGreenR_;
int16_t blackLevelGreenB_;