[v5,19/22] ipa: rppx1: Add gamma correction
diff mbox series

Message ID 20261116174919.1056403-20-barnabas.pocze@ideasonboard.com
State New
Headers show
Series
  • libcamera: rcar-gen4 + rpp-x1
Related show

Commit Message

Barnabás Pőcze Nov. 16, 2026, 5:49 p.m. UTC
From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

Add the algorithm to the rppx1 ipa module based on the corresponding
algorithm in the rkisp1 ipa module.

Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/ipa/rppx1/algorithms/gamma.cpp   | 71 ++++++++++++++++++++++++++++
 src/ipa/rppx1/algorithms/gamma.h     | 46 ++++++++++++++++++
 src/ipa/rppx1/algorithms/meson.build |  1 +
 src/ipa/rppx1/ipa_context.h          |  5 ++
 src/ipa/rppx1/params.h               |  2 +
 5 files changed, 125 insertions(+)
 create mode 100644 src/ipa/rppx1/algorithms/gamma.cpp
 create mode 100644 src/ipa/rppx1/algorithms/gamma.h

Patch
diff mbox series

diff --git a/src/ipa/rppx1/algorithms/gamma.cpp b/src/ipa/rppx1/algorithms/gamma.cpp
new file mode 100644
index 0000000000..53ccae4c88
--- /dev/null
+++ b/src/ipa/rppx1/algorithms/gamma.cpp
@@ -0,0 +1,71 @@ 
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2026, Ideas On Board
+ *
+ * RPP-X1 gamma correction algorithm
+ */
+
+#include "gamma.h"
+
+namespace libcamera {
+
+namespace ipa::rppx1::algorithms {
+
+int Gamma::init(IPAContext &context, const ValueNode &tuningData)
+{
+	/*
+	 * The segments as specified in the reference for
+	 * RPPX1_GA_SEG_MODE_LOGARITHMIC.
+	 */
+	static constexpr unsigned int segments[] = {
+		64, 64, 64, 64, 128, 128, 128, 128,
+		256, 256, 256, 512, 512, 512, 512, 512,
+	};
+
+	return gamma_.init(context.ctrlMap, tuningData, segments);
+}
+
+int Gamma::configure(IPAContext &context,
+		     [[maybe_unused]] const IPACameraSensorInfo &configInfo)
+{
+	gamma_.configure(context.activeState.gamma);
+	return 0;
+}
+
+void Gamma::queueRequest(IPAContext &context, const uint32_t frame,
+			 IPAFrameContext &frameContext,
+			 const ControlList &controls)
+{
+	gamma_.queueRequest(context.activeState.gamma, frame,
+			    frameContext.gamma, controls);
+}
+
+void Gamma::prepare([[maybe_unused]] IPAContext &context,
+		    [[maybe_unused]] const uint32_t frame,
+		    IPAFrameContext &frameContext,
+		    RppX1Params *params)
+{
+	if (!frameContext.gamma.update)
+		return;
+
+	auto config = params->block<BlockType::GaHv>();
+	config.setEnabled(true);
+
+	config->mode = RPPX1_GA_SEG_MODE_LOGARITHMIC;
+	gamma_.prepare(frameContext.gamma, std::span(config->gamma_y));
+}
+
+void Gamma::process([[maybe_unused]] IPAContext &context,
+		    [[maybe_unused]] const uint32_t frame,
+		    IPAFrameContext &frameContext,
+		    [[maybe_unused]] const RppX1Stats *stats,
+		    ControlList &metadata)
+{
+	metadata.set(controls::Gamma, frameContext.gamma.gamma);
+}
+
+REGISTER_IPA_ALGORITHM(Gamma, "Gamma")
+
+} /* namespace ipa::rppx1::algorithms */
+
+} /* namespace libcamera */
diff --git a/src/ipa/rppx1/algorithms/gamma.h b/src/ipa/rppx1/algorithms/gamma.h
new file mode 100644
index 0000000000..8fcb4429ba
--- /dev/null
+++ b/src/ipa/rppx1/algorithms/gamma.h
@@ -0,0 +1,46 @@ 
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2026, Ideas On Board
+ *
+ * RPP-X1 gamma correction algorithm
+ */
+
+#pragma once
+
+#include <libipa/gamma.h>
+
+#include "algorithm.h"
+
+namespace libcamera {
+
+namespace ipa::rppx1::algorithms {
+
+class Gamma : 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:
+	/*
+	 * for RPP_OUT ("human vision") pipeline with 12-bit gamma values;
+	 * in contrast, RPP_MV ("machine vision") has 24-bit gamma values
+	 */
+	GammaAlgorithm<RPPX1_GA_MAX_SAMPLES, UQ<0, 12>> gamma_;
+};
+
+} /* namespace ipa::rppx1::algorithms */
+
+} /* namespace libcamera */
diff --git a/src/ipa/rppx1/algorithms/meson.build b/src/ipa/rppx1/algorithms/meson.build
index 7e0b4ad011..7394b55bca 100644
--- a/src/ipa/rppx1/algorithms/meson.build
+++ b/src/ipa/rppx1/algorithms/meson.build
@@ -5,5 +5,6 @@  rppx1_ipa_algorithms = files([
     'awb.cpp',
     'blc.cpp',
     'ccm.cpp',
+    'gamma.cpp',
     'lux.cpp',
 ])
diff --git a/src/ipa/rppx1/ipa_context.h b/src/ipa/rppx1/ipa_context.h
index 1f0b24635a..d965311ca1 100644
--- a/src/ipa/rppx1/ipa_context.h
+++ b/src/ipa/rppx1/ipa_context.h
@@ -21,6 +21,7 @@ 
 #include <libipa/ccm.h>
 #include <libipa/camera_sensor_helper.h>
 #include <libipa/fc_queue.h>
+#include <libipa/gamma.h>
 #include <libipa/lux.h>
 
 namespace libcamera {
@@ -47,6 +48,8 @@  struct IPAActiveState {
 
 	ipa::ccm::ActiveState ccm;
 
+	ipa::gamma::ActiveState gamma;
+
 	ipa::lux::ActiveState lux;
 };
 
@@ -65,6 +68,8 @@  struct IPAFrameContext : public FrameContext {
 
 	ipa::ccm::FrameContext ccm;
 
+	ipa::gamma::FrameContext gamma;
+
 	ipa::lux::FrameContext lux;
 };
 
diff --git a/src/ipa/rppx1/params.h b/src/ipa/rppx1/params.h
index b863b9ba19..b724fa3162 100644
--- a/src/ipa/rppx1/params.h
+++ b/src/ipa/rppx1/params.h
@@ -20,6 +20,7 @@  enum class BlockType : uint16_t {
 	BlsPre1,
 	CcorPost,
 	ExmPre1,
+	GaHv,
 	HistPost,
 	WbMeasPost,
 };
@@ -42,6 +43,7 @@  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(GaHv, ga, GA_HV)
 RPPX1_DEFINE_BLOCK_TYPE(HistPost, hist, HIST_POST)
 RPPX1_DEFINE_BLOCK_TYPE(WbMeasPost, wbmeas, WBMEAS_POST)