PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipa: rpi: Add FE globals as a parameter to applyDecompand()

Browse Source 
Don't let applyDecompand() directly change the FE global enables.
Instead pass the global mask into the function and set it in the caller.
This will be needed when a future commit will add setting the decompand
initial values.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Tested-by: Nick Hollinghurst <nick.hollinghurst@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
2025-10-03 13:15:53 +01:00
committed by Kieran Bingham
parent bfd09aa474
commit ffcdbf0980
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ipa/rpi/pisp/pisp.cpp
View File

@@ -256,7 +256,7 @@ private:
void applyLensShading(const AlscStatus *alscStatus,
pisp_be_global_config &global);
void applyDPC(const DpcStatus *dpcStatus, pisp_be_global_config &global);
void applyDecompand(const DecompandStatus *decompandStatus);
void applyDecompand(const DecompandStatus *decompandStatus, pisp_fe_global_config &feGlobal);
void applySdn(const SdnStatus *sdnStatus, pisp_be_global_config &global);
void applyTdn(const TdnStatus *tdnStatus, const DeviceStatus *deviceStatus,
pisp_be_global_config &global);
@@ -368,6 +368,9 @@ void IpaPiSP::platformPrepareIsp([[maybe_unused]] const PrepareParams &params,
{
/* All Frontend config goes first, we do not want to hold the FE lock for long! */
std::scoped_lock<FrontEnd> lf(*fe_);
pisp_fe_global_config feGlobal;
fe_->GetGlobal(feGlobal);
if (noiseStatus)
applyFocusStats(noiseStatus);
@@ -375,13 +378,14 @@ void IpaPiSP::platformPrepareIsp([[maybe_unused]] const PrepareParams &params,
DecompandStatus *decompandStatus =
rpiMetadata.getLocked<DecompandStatus>("decompand.status");
if (decompandStatus)
applyDecompand(decompandStatus);
applyDecompand(decompandStatus, feGlobal);
BlackLevelStatus *blackLevelStatus =
rpiMetadata.getLocked<BlackLevelStatus>("black_level.status");
if (blackLevelStatus)
applyBlackLevel(blackLevelStatus, global);
fe_->SetGlobal(feGlobal);
}
CacStatus *cacStatus = rpiMetadata.getLocked<CacStatus>("cac.status");
@@ -728,16 +732,15 @@ void IpaPiSP::applyDPC(const DpcStatus *dpcStatus, pisp_be_global_config &global
be_->SetDpc(dpc);
}
void IpaPiSP::applyDecompand(const DecompandStatus *decompandStatus)
void IpaPiSP::applyDecompand(const DecompandStatus *decompandStatus, pisp_fe_global_config &feGlobal)
{
pisp_fe_global_config feGlobal;
pisp_fe_decompand_config decompand = {};
if (!generateDecompandLut(decompandStatus->decompandCurve, decompand.lut)) {
fe_->SetDecompand(decompand);
feGlobal.enables |= PISP_FE_ENABLE_DECOMPAND;
fe_->SetGlobal(feGlobal);
}
} else
feGlobal.enables &= ~PISP_FE_ENABLE_DECOMPAND;
}
void IpaPiSP::applySdn(const SdnStatus *sdnStatus, pisp_be_global_config &global)