From 01132257b9e70e6408e98e7df684c6db3aefe8e8 Mon Sep 17 00:00:00 2001 From: Stefan Klug Date: Fri, 12 Jul 2024 16:32:06 +0200 Subject: ipa: rkisp1: ccm: Ensure metadata contains valid ccm When the colour temperature does not change between frames, the ccm inside the frame context is not updated and the metadata contains invalid data. Fix that by caching the ccm inside the active state. Signed-off-by: Stefan Klug Reviewed-by: Daniel Scally Reviewed-by: Kieran Bingham Reviewed-by: Paul Elder [Kieran: Remove spurious [[maybe_unused]] addition] Signed-off-by: Kieran Bingham --- src/ipa/rkisp1/algorithms/ccm.cpp | 5 ++++- src/ipa/rkisp1/ipa_context.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp index 4c4e3f50..fe7246f8 100644 --- a/src/ipa/rkisp1/algorithms/ccm.cpp +++ b/src/ipa/rkisp1/algorithms/ccm.cpp @@ -111,13 +111,16 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame, * \todo The colour temperature will likely be noisy, add filtering to * avoid updating the CCM matrix all the time. */ - if (frame > 0 && ct == ct_) + if (frame > 0 && ct == ct_) { + frameContext.ccm.ccm = context.activeState.ccm.ccm; return; + } ct_ = ct; Matrix ccm = ccm_.get(ct); Matrix offsets = offsets_.get(ct); + context.activeState.ccm.ccm = ccm; frameContext.ccm.ccm = ccm; setParameters(params, ccm, offsets); diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h index 27a9bf62..061efc0c 100644 --- a/src/ipa/rkisp1/ipa_context.h +++ b/src/ipa/rkisp1/ipa_context.h @@ -97,6 +97,10 @@ struct IPAActiveState { bool autoEnabled; } awb; + struct { + Matrix ccm; + } ccm; + struct { int8_t brightness; uint8_t contrast; -- cgit v1.2.1