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

ipa: rpi: vc4: Move denoise control handling into the VC4 derived IPA

Browse source 
Since noise control handling differs between the VC4 and PiSP IPAs,
move the current denoise control handler from ipa base into the vc4 IPA
derived class.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2023-10-16 15:36:29 +01:00 • committed by Kieran Bingham
parent edb48a1337
commit 4e7c26b197
2 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/ipa/rpi/common/ipa_base.cpp
View file

@ -643,14 +643,6 @@ static const std::map<int32_t, std::string> AwbModeTable = {
{ controls::AwbCustom, "custom" }, { controls::AwbCustom, "custom" },
}; };
static const std::map<int32_t, RPiController::DenoiseMode> DenoiseModeTable = {
{ controls::draft::NoiseReductionModeOff, RPiController::DenoiseMode::Off },
{ controls::draft::NoiseReductionModeFast, RPiController::DenoiseMode::ColourFast },
{ controls::draft::NoiseReductionModeHighQuality, RPiController::DenoiseMode::ColourHighQuality },
{ controls::draft::NoiseReductionModeMinimal, RPiController::DenoiseMode::ColourOff },
{ controls::draft::NoiseReductionModeZSL, RPiController::DenoiseMode::ColourHighQuality },
};
static const std::map<int32_t, RPiController::AfAlgorithm::AfMode> AfModeTable = { static const std::map<int32_t, RPiController::AfAlgorithm::AfMode> AfModeTable = {
{ controls::AfModeManual, RPiController::AfAlgorithm::AfModeManual }, { controls::AfModeManual, RPiController::AfAlgorithm::AfModeManual },
{ controls::AfModeAuto, RPiController::AfAlgorithm::AfModeAuto }, { controls::AfModeAuto, RPiController::AfAlgorithm::AfModeAuto },
@ -1032,36 +1024,11 @@ void IpaBase::applyControls(const ControlList &controls)
break; break;
} }
case controls::NOISE_REDUCTION_MODE: { case controls::NOISE_REDUCTION_MODE:
RPiController::DenoiseAlgorithm *sdn = dynamic_cast<RPiController::DenoiseAlgorithm *>( /* Handled below in handleControls() */
controller_.getAlgorithm("SDN")); libcameraMetadata_.set(controls::draft::NoiseReductionMode,
/* Some platforms may have a combined "denoise" algorithm instead. */ ctrl.second.get<int32_t>());
if (!sdn)
sdn = dynamic_cast<RPiController::DenoiseAlgorithm *>(
controller_.getAlgorithm("denoise"));
if (!sdn) {
LOG(IPARPI, Warning)
<< "Could not set NOISE_REDUCTION_MODE - no SDN algorithm";
break;
}
int32_t idx = ctrl.second.get<int32_t>();
auto mode = DenoiseModeTable.find(idx);
if (mode != DenoiseModeTable.end()) {
sdn->setMode(mode->second);
/*
* \todo If the colour denoise is not going to run due to an
* analysis image resolution or format mismatch, we should
* report the status correctly in the metadata.
*/
libcameraMetadata_.set(controls::draft::NoiseReductionMode, idx);
} else {
LOG(IPARPI, Error) << "Noise reduction mode " << idx
<< " not recognised";
}
break; break;
}
case controls::AF_MODE: case controls::AF_MODE:
break; /* We already handled this one above */ break; /* We already handled this one above */

35
src/ipa/rpi/vc4/vc4.cpp
View file

@ -11,6 +11,7 @@
#include <linux/bcm2835-isp.h> #include <linux/bcm2835-isp.h>
#include <libcamera/base/log.h> #include <libcamera/base/log.h>
#include <libcamera/control_ids.h>
#include <libcamera/ipa/ipa_module_info.h> #include <libcamera/ipa/ipa_module_info.h>
#include "common/ipa_base.h" #include "common/ipa_base.h"
@ -247,9 +248,39 @@ RPiController::StatisticsPtr IpaVc4::platformProcessStats(Span<uint8_t> mem)
return statistics; return statistics;
} }
void IpaVc4::handleControls([[maybe_unused]] const ControlList &controls) void IpaVc4::handleControls(const ControlList &controls)
{ {
/* No controls require any special updates to the hardware configuration. */ static const std::map<int32_t, RPiController::DenoiseMode> DenoiseModeTable = {
{ controls::draft::NoiseReductionModeOff, RPiController::DenoiseMode::Off },
{ controls::draft::NoiseReductionModeFast, RPiController::DenoiseMode::ColourFast },
{ controls::draft::NoiseReductionModeHighQuality, RPiController::DenoiseMode::ColourHighQuality },
{ controls::draft::NoiseReductionModeMinimal, RPiController::DenoiseMode::ColourOff },
{ controls::draft::NoiseReductionModeZSL, RPiController::DenoiseMode::ColourHighQuality },
};
for (auto const &ctrl : controls) {
switch (ctrl.first) {
case controls::NOISE_REDUCTION_MODE: {
RPiController::DenoiseAlgorithm *sdn = dynamic_cast<RPiController::DenoiseAlgorithm *>(
controller_.getAlgorithm("SDN"));
/* Some platforms may have a combined "denoise" algorithm instead. */
if (!sdn)
sdn = dynamic_cast<RPiController::DenoiseAlgorithm *>(
controller_.getAlgorithm("denoise"));
if (!sdn) {
LOG(IPARPI, Warning)
<< "Could not set NOISE_REDUCTION_MODE - no SDN algorithm";
return;
}
int32_t idx = ctrl.second.get<int32_t>();
auto mode = DenoiseModeTable.find(idx);
if (mode != DenoiseModeTable.end())
sdn->setMode(mode->second);
break;
}
}
}
} }
bool IpaVc4::validateIspControls() bool IpaVc4::validateIspControls()