libcamera: software_isp: Black level from tuning file
This patch allows obtaining a black level from a tuning file in addition to the camera sensor helper. If both of them define a black level, the one from the tuning file takes precedence. The use cases are: - A user wants to use a different black level, for whatever reason. - There is a sensor without known gains but with a known black level. Because a camera sensor helper cannot be defined without specifying gains, the only way to specify the black level is using the tuning file. Software ISP uses its fallback gain handling in such a case. Signed-off-by: Milan Zamazal <mzamazal@redhat.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
committed by
Kieran Bingham
parent
7bbe26bbc4
commit
7cbd05dc01
@@ -21,6 +21,19 @@ BlackLevel::BlackLevel()
|
||||
{
|
||||
}
|
||||
|
||||
int BlackLevel::init(IPAContext &context, const YamlObject &tuningData)
|
||||
{
|
||||
auto blackLevel = tuningData["blackLevel"].get<int16_t>();
|
||||
if (blackLevel.has_value()) {
|
||||
/*
|
||||
* Convert 16 bit values from the tuning file to 8 bit black
|
||||
* level for the SoftISP.
|
||||
*/
|
||||
context.configuration.black.level = blackLevel.value() >> 8;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int BlackLevel::configure(IPAContext &context,
|
||||
[[maybe_unused]] const IPAConfigInfo &configInfo)
|
||||
{
|
||||
|
||||
@@ -19,6 +19,7 @@ public:
|
||||
BlackLevel();
|
||||
~BlackLevel() = default;
|
||||
|
||||
int init(IPAContext &context, const YamlObject &tuningData) override;
|
||||
int configure(IPAContext &context, const IPAConfigInfo &configInfo) override;
|
||||
void process(IPAContext &context, const uint32_t frame,
|
||||
IPAFrameContext &frameContext,
|
||||
|
||||
@@ -206,7 +206,8 @@ int IPASoftSimple::configure(const IPAConfigInfo &configInfo)
|
||||
(context_.configuration.agc.againMax -
|
||||
context_.configuration.agc.againMin) /
|
||||
100.0;
|
||||
if (camHelper_->blackLevel().has_value()) {
|
||||
if (!context_.configuration.black.level.has_value() &&
|
||||
camHelper_->blackLevel().has_value()) {
|
||||
/*
|
||||
* The black level from camHelper_ is a 16 bit value, software ISP
|
||||
* works with 8 bit pixel values, both regardless of the actual
|
||||
|
||||
Reference in New Issue
Block a user