6 files changed, 153 insertions, 0 deletions
diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp
new file mode 100644
index 00000000..bca5ab69
--- /dev/null
+++ b/src/ipa/rkisp1/algorithms/cproc.cpp
@@ -0,0 +1,97 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2021-2022, Ideas On Board
+ *
+ * cproc.cpp - RkISP1 Color Processing control
+ */
+
+#include "cproc.h"
+
+#include <algorithm>
+#include <cmath>
+
+#include <libcamera/base/log.h>
+
+#include <libcamera/control_ids.h>
+
+/**
+ * \file cproc.h
+ */
+
+namespace libcamera {
+
+namespace ipa::rkisp1::algorithms {
+
+/**
+ * \class ColorProcessing
+ * \brief RkISP1 Color Processing control
+ *
+ * The ColorProcessing algorithm is responsible for applying brightness,
+ * contrast and saturation corrections. The values are directly provided
+ * through requests by the corresponding controls.
+ */
+
+LOG_DEFINE_CATEGORY(RkISP1CProc)
+
+/**
+ * \copydoc libcamera::ipa::Algorithm::queueRequest
+ */
+void ColorProcessing::queueRequest(IPAContext &context,
+				   [[maybe_unused]] const uint32_t frame,
+				   const ControlList &controls)
+{
+	auto &cproc = context.frameContext.cproc;
+
+	const auto &brightness = controls.get(controls::Brightness);
+	if (brightness) {
+		cproc.brightness = std::clamp<int>(std::lround(*brightness * 128), -128, 127);
+		cproc.updateParams = true;
+
+		LOG(RkISP1CProc, Debug) << "Set brightness to " << *brightness;
+	}
+
+	const auto &contrast = controls.get(controls::Contrast);
+	if (contrast) {
+		cproc.contrast = std::clamp<int>(std::lround(*contrast * 128), 0, 255);
+		cproc.updateParams = true;
+
+		LOG(RkISP1CProc, Debug) << "Set contrast to " << *contrast;
+	}
+
+	const auto saturation = controls.get(controls::Saturation);
+	if (saturation) {
+		cproc.saturation = std::clamp<int>(std::lround(*saturation * 128), 0, 255);
+		cproc.updateParams = true;
+
+		LOG(RkISP1CProc, Debug) << "Set saturation to " << *saturation;
+	}
+}
+
+/**
+ * \copydoc libcamera::ipa::Algorithm::prepare
+ */
+void ColorProcessing::prepare(IPAContext &context,
+			      rkisp1_params_cfg *params)
+{
+	auto &cproc = context.frameContext.cproc;
+
+	/* Check if the algorithm configuration has been updated. */
+	if (!cproc.updateParams)
+		return;
+
+	cproc.updateParams = false;
+
+	params->others.cproc_config.brightness = cproc.brightness;
+	params->others.cproc_config.contrast = cproc.contrast;
+	params->others.cproc_config.sat = cproc.saturation;
+
+	params->module_en_update |= RKISP1_CIF_ISP_MODULE_CPROC;
+	params->module_ens |= RKISP1_CIF_ISP_MODULE_CPROC;
+	params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_CPROC;
+}
+
+REGISTER_IPA_ALGORITHM(ColorProcessing, "ColorProcessing")
+
+} /* namespace ipa::rkisp1::algorithms */
+
+} /* namespace libcamera */
diff --git a/src/ipa/rkisp1/algorithms/cproc.h b/src/ipa/rkisp1/algorithms/cproc.h
new file mode 100644
index 00000000..4b7e4064
--- /dev/null
+++ b/src/ipa/rkisp1/algorithms/cproc.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2021-2022, Ideas On Board
+ *
+ * cproc.h - RkISP1 Color Processing control
+ */
+
+#pragma once
+
+#include <sys/types.h>
+
+#include "algorithm.h"
+
+namespace libcamera {
+
+namespace ipa::rkisp1::algorithms {
+
+class ColorProcessing : public Algorithm
+{
+public:
+	ColorProcessing() = default;
+	~ColorProcessing() = default;
+
+	void queueRequest(IPAContext &context, const uint32_t frame,
+			  const ControlList &controls) override;
+	void prepare(IPAContext &context, rkisp1_params_cfg *params) override;
+};
+
+} /* namespace ipa::rkisp1::algorithms */
+} /* namespace libcamera */
diff --git a/src/ipa/rkisp1/algorithms/meson.build b/src/ipa/rkisp1/algorithms/meson.build
index dcd24fe0..e48974b4 100644
--- a/src/ipa/rkisp1/algorithms/meson.build
+++ b/src/ipa/rkisp1/algorithms/meson.build
@@ -4,6 +4,7 @@ rkisp1_ipa_algorithms = files([
     'agc.cpp',
     'awb.cpp',
     'blc.cpp',
+    'cproc.cpp',
     'dpcc.cpp',
     'filter.cpp',
     'gsl.cpp',
diff --git a/src/ipa/rkisp1/data/ov5640.yaml b/src/ipa/rkisp1/data/ov5640.yaml
index 99529481..93d7d1e7 100644
--- a/src/ipa/rkisp1/data/ov5640.yaml
+++ b/src/ipa/rkisp1/data/ov5640.yaml
@@ -10,6 +10,7 @@ algorithms:
       Gr: 256
       Gb: 256
       B:  256
+  - ColorProcessing:
   - GammaSensorLinearization:
       x-intervals: [ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 ]
       y:
diff --git a/src/ipa/rkisp1/ipa_context.cpp b/src/ipa/rkisp1/ipa_context.cpp
index 4b117186..ef8bb8e9 100644
--- a/src/ipa/rkisp1/ipa_context.cpp
+++ b/src/ipa/rkisp1/ipa_context.cpp
@@ -137,6 +137,23 @@ namespace libcamera::ipa::rkisp1 {
  */
 
 /**
+ * \var IPAFrameContext::cproc
+ * \brief Context for the Color Processing algorithm
+ *
+ * \struct IPAFrameContext::cproc.brightness
+ * \brief Brightness level
+ *
+ * \var IPAFrameContext::cproc.contrast
+ * \brief Contrast level
+ *
+ * \var IPAFrameContext::cproc.saturation
+ * \brief Saturation level
+ *
+ * \var IPAFrameContext::cproc.updateParams
+ * \brief Indicates if ISP parameters need to be updated
+ */
+
+/**
  * \var IPAFrameContext::filter
  * \brief Context for the Filter algorithm
  *
diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h
index 3b2f6af1..2bdb6a81 100644
--- a/src/ipa/rkisp1/ipa_context.h
+++ b/src/ipa/rkisp1/ipa_context.h
@@ -58,6 +58,13 @@ struct IPAFrameContext {
 	} awb;
 
 	struct {
+		int8_t brightness;
+		uint8_t contrast;
+		uint8_t saturation;
+		bool updateParams;
+	} cproc;
+
+	struct {
 		uint8_t denoise;
 		uint8_t sharpness;
 		bool updateParams;