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

libcamera: ipa: simple: Unwrap IPAFrameContext::ccm

Browse Source 
The struct has only one member and there is no immediate need to add
more.  Let's use the member directly, to make things a bit simpler.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Milan Zamazal
2026-01-28 12:43:49 +01:00
committed by Kieran Bingham
parent 7a8a3b6340
commit 3dbe06a15f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ipa/simple/algorithms/ccm.cpp
View File

@@ -94,7 +94,7 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,
if (frame > 0 &&
utils::abs_diff(ct, lastCt_) < kTemperatureThreshold &&
saturation == lastSaturation_) {
frameContext.ccm.ccm = context.activeState.ccm.ccm;
frameContext.ccm = context.activeState.ccm.ccm;
context.activeState.ccm.changed = false;
return;
}
@@ -106,9 +106,9 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,
applySaturation(ccm, saturation.value());
context.activeState.ccm.ccm = ccm;
frameContext.ccm.ccm = ccm;
frameContext.saturation = saturation;
context.activeState.ccm.changed = true;
frameContext.ccm = ccm;
}
void Ccm::process([[maybe_unused]] IPAContext &context,
@@ -117,7 +117,7 @@ void Ccm::process([[maybe_unused]] IPAContext &context,
[[maybe_unused]] const SwIspStats *stats,
ControlList &metadata)
{
metadata.set(controls::ColourCorrectionMatrix, frameContext.ccm.ccm.data());
metadata.set(controls::ColourCorrectionMatrix, frameContext.ccm.data());
const auto &saturation = frameContext.saturation;
metadata.set(controls::Saturation, saturation.value_or(1.0));

4
src/ipa/simple/ipa_context.h
View File

@@ -75,9 +75,7 @@ struct IPAActiveState {
};
struct IPAFrameContext : public FrameContext {
struct {
Matrix<float, 3, 3> ccm;
} ccm;
Matrix<float, 3, 3> ccm;
struct {
int32_t exposure;