@@ -249,6 +249,12 @@ RppX1AwbStats Awb::calculateRgbMeans(const IPAFrameContext &frameContext,
*/
rgbMeans = rgbMeans.max(0.0);
+ /*
+ * The ISP computes the AWB means after applying the CCM. Apply the
+ * inverse as we want to get the raw means before the colour gains.
+ */
+ rgbMeans = frameContext.ccm.ccm.inverse() * rgbMeans;
+
/*
* The ISP computes the AWB means after applying the colour gains,
* divide by the gains that were used to get the raw means from the
new file mode 100644
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2026, Ideas On Board
+ *
+ * RPP-X1 Color Correction Matrix control algorithm
+ */
+
+#include "ccm.h"
+
+#include <libcamera/base/log.h>
+
+/**
+ * \file ccm.h
+ */
+
+namespace libcamera {
+
+namespace ipa::rppx1::algorithms {
+
+LOG_DEFINE_CATEGORY(RppX1Ccm)
+
+/**
+ * \copydoc libcamera::ipa::Algorithm::init
+ */
+int Ccm::init([[maybe_unused]] IPAContext &context, const ValueNode &tuningData)
+{
+ return ccmAlgo_.init(tuningData, context.ctrlMap);
+}
+
+/**
+ * \copydoc libcamera::ipa::Algorithm::configure
+ */
+int Ccm::configure(IPAContext &context,
+ [[maybe_unused]] const IPACameraSensorInfo &configInfo)
+{
+ return ccmAlgo_.configure(context.activeState.ccm,
+ context.activeState.awb.automatic.colourTemperature);
+}
+
+void Ccm::queueRequest(IPAContext &context,
+ [[maybe_unused]] const uint32_t frame,
+ IPAFrameContext &frameContext,
+ const ControlList &controls)
+{
+ /* Nothing to do here, the ccm will be calculated in prepare() */
+ if (frameContext.awb.autoEnabled)
+ return;
+
+ ccmAlgo_.queueRequest(context.activeState.ccm, frameContext.ccm, controls);
+}
+
+void Ccm::setParameters(rppx1_ccor_params &config, IPAFrameContext &context)
+{
+ const Matrix<float, 3, 3> &matrix = context.ccm.ccm;
+ const Matrix<int16_t, 3, 1> &offsets = context.ccm.offsets;
+
+ /*
+ * RPP-X1 coefficients are Q4.12 signed fixed-point ranging from
+ * -8 (0x8000) to +7.9996 (0x7fff). x1 = 0x1000.
+ */
+ for (unsigned int i = 0; i < 3; i++) {
+ for (unsigned int j = 0; j < 3; j++)
+ config.coeff[i][j] = Q<4, 12>(matrix[i][j]).quantized();
+ }
+
+ /* RPP-X1 offsets are 25 bits 2's complement.
+ * \todo: Better investigate how negative offsets are handled in the
+ * offsets interpolation and if the shift is correct.
+ */
+
+ for (unsigned int i = 0; i < 3; i++)
+ config.offset[i] = static_cast<int32_t>(offsets[i][0]) << 8;
+
+ LOG(RppX1Ccm, Debug) << "Setting matrix " << matrix;
+ LOG(RppX1Ccm, Debug) << "Setting offsets " << offsets;
+}
+
+/**
+ * \copydoc libcamera::ipa::Algorithm::prepare
+ */
+void Ccm::prepare(IPAContext &context, const uint32_t frame,
+ IPAFrameContext &frameContext, RppX1Params *params)
+{
+ if (frameContext.awb.autoEnabled)
+ ccmAlgo_.prepare(context.activeState.ccm, frameContext.ccm,
+ frame, frameContext.awb.colourTemperature);
+
+ auto config = params->block<BlockType::CcorPost>();
+ config.setEnabled(true);
+
+ setParameters(*config, frameContext);
+}
+
+/**
+ * \copydoc libcamera::ipa::Algorithm::process
+ */
+void Ccm::process([[maybe_unused]] IPAContext &context,
+ [[maybe_unused]] const uint32_t frame,
+ IPAFrameContext &frameContext,
+ [[maybe_unused]] const RppX1Stats *stats,
+ ControlList &metadata)
+{
+ ccmAlgo_.process(frameContext.ccm, metadata);
+}
+
+REGISTER_IPA_ALGORITHM(Ccm, "Ccm")
+
+} /* namespace ipa::rppx1::algorithms */
+
+} /* namespace libcamera */
new file mode 100644
@@ -0,0 +1,45 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2026, Ideas On Board
+ *
+ * RPP-X1 Color Correction Matrix control algorithm
+ */
+
+#pragma once
+
+#include "libipa/ccm.h"
+#include "libipa/fixedpoint.h"
+
+#include "algorithm.h"
+
+namespace libcamera {
+
+namespace ipa::rppx1::algorithms {
+
+class Ccm : public Algorithm
+{
+public:
+ int init(IPAContext &context, const ValueNode &tuningData) override;
+ int configure(IPAContext &context,
+ const IPACameraSensorInfo &configInfo) override;
+ void queueRequest(IPAContext &context,
+ const uint32_t frame,
+ IPAFrameContext &frameContext,
+ const ControlList &controls) override;
+ void prepare(IPAContext &context, const uint32_t frame,
+ IPAFrameContext &frameContext,
+ RppX1Params *params) override;
+ void process(IPAContext &context, const uint32_t frame,
+ IPAFrameContext &frameContext,
+ const RppX1Stats *stats,
+ ControlList &metadata) override;
+
+private:
+ void setParameters(rppx1_ccor_params &config, IPAFrameContext &context);
+
+ CcmAlgorithm<Q<4, 12>> ccmAlgo_;
+};
+
+} /* namespace ipa::rppx1::algorithms */
+
+} /* namespace libcamera */
@@ -4,5 +4,6 @@ rppx1_ipa_algorithms = files([
'agc.cpp',
'awb.cpp',
'blc.cpp',
+ 'ccm.cpp',
'lux.cpp',
])
@@ -18,6 +18,7 @@
#include <libipa/agc.h>
#include <libipa/awb.h>
+#include <libipa/ccm.h>
#include <libipa/camera_sensor_helper.h>
#include <libipa/fc_queue.h>
@@ -43,6 +44,8 @@ struct IPAActiveState {
ipa::awb::ActiveState awb;
+ ipa::ccm::ActiveState ccm;
+
struct {
double lux;
} lux;
@@ -61,6 +64,8 @@ struct IPAFrameContext : public FrameContext {
ipa::awb::FrameContext awb;
+ ipa::ccm::FrameContext ccm;
+
struct {
double lux;
} lux;
@@ -18,6 +18,7 @@ namespace ipa::rppx1 {
enum class BlockType : uint16_t {
AwbGPre1,
BlsPre1,
+ CcorPost,
ExmPre1,
HistPost,
WbMeasPost,
@@ -39,6 +40,7 @@ struct block_type {
RPPX1_DEFINE_BLOCK_TYPE(AwbGPre1, awbg, AWBG_PRE1)
RPPX1_DEFINE_BLOCK_TYPE(BlsPre1, bls, BLS_PRE1)
+RPPX1_DEFINE_BLOCK_TYPE(CcorPost, ccor, CCOR_POST)
RPPX1_DEFINE_BLOCK_TYPE(ExmPre1, exm, EXM_PRE1)
RPPX1_DEFINE_BLOCK_TYPE(HistPost, hist, HIST_POST)
RPPX1_DEFINE_BLOCK_TYPE(WbMeasPost, wbmeas, WBMEAS_POST)