[libcamera-devel] [PATCH v2 4/4] ipa: rkisp1: Add support of ColorProcessing control
Florian Sylvestre
fsylvestre at baylibre.com
Wed Jul 20 17:42:21 CEST 2022
Add ColorProcessing algorithm that is in charge to manage brightness, contrast
and saturation controls.
These controls are currently based on user controls.
Signed-off-by: Florian Sylvestre <fsylvestre at baylibre.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
src/ipa/rkisp1/algorithms/cproc.cpp | 94 ++++++++++++++++++++++++
src/ipa/rkisp1/algorithms/cproc.h | 30 ++++++++
src/ipa/rkisp1/algorithms/meson.build | 1 +
src/ipa/rkisp1/data/ov5640.yaml | 1 +
src/ipa/rkisp1/ipa_context.h | 7 ++
src/ipa/rkisp1/rkisp1.cpp | 1 +
src/libcamera/pipeline/rkisp1/rkisp1.cpp | 12 +++
7 files changed, 146 insertions(+)
create mode 100644 src/ipa/rkisp1/algorithms/cproc.cpp
create mode 100644 src/ipa/rkisp1/algorithms/cproc.h
diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp
new file mode 100644
index 00000000..7e9e8cf1
--- /dev/null
+++ b/src/ipa/rkisp1/algorithms/cproc.cpp
@@ -0,0 +1,94 @@
+/* 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 <libcamera/base/log.h>
+
+#include <libcamera/control_ids.h>
+
+#include "libcamera/internal/yaml_parser.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([[maybe_unused]] IPAContext &context,
+ [[maybe_unused]] const uint32_t frame,
+ const ControlList &controls)
+{
+ const auto &brightness = controls.get(controls::Brightness);
+ if (brightness) {
+ context.frameContext.cproc.brightness = std::clamp(int(*brightness * 128), -128, 127);
+ context.frameContext.cproc.updateParams = true;
+
+ LOG(RkISP1CProc, Debug) << "Set brightness to " << *brightness;
+ }
+
+ const auto &contrast = controls.get(controls::Contrast);
+ if (contrast) {
+ context.frameContext.cproc.contrast = std::clamp(int(*contrast * 128), 0, 255);
+ context.frameContext.cproc.updateParams = true;
+
+ LOG(RkISP1CProc, Debug) << "Set contrast to " << *contrast;
+ }
+
+ const auto saturation = controls.get(controls::Saturation);
+ if (saturation) {
+ context.frameContext.cproc.saturation = std::clamp(int(*saturation) * 128, 0, 255);
+ context.frameContext.cproc.updateParams = true;
+
+ LOG(RkISP1CProc, Debug) << "Set saturation to " << *saturation;
+ }
+}
+
+/**
+ * \copydoc libcamera::ipa::Algorithm::prepare
+ */
+void ColorProcessing::prepare([[maybe_unused]] IPAContext &context,
+ rkisp1_params_cfg *params)
+{
+ /* Check if the algorithm configuration has been updated. */
+ if (!context.frameContext.cproc.updateParams)
+ return;
+
+ context.frameContext.cproc.updateParams = false;
+
+ params->others.cproc_config.brightness = context.frameContext.cproc.brightness;
+ params->others.cproc_config.contrast = context.frameContext.cproc.contrast;
+ params->others.cproc_config.sat = context.frameContext.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 7e078b0d..0ec17e07 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',
'demosaicing.cpp',
'dpcc.cpp',
'gsl.cpp',
diff --git a/src/ipa/rkisp1/data/ov5640.yaml b/src/ipa/rkisp1/data/ov5640.yaml
index 4ae0ffc0..331f9d2d 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.h b/src/ipa/rkisp1/ipa_context.h
index 241a4d04..e6a61c45 100644
--- a/src/ipa/rkisp1/ipa_context.h
+++ b/src/ipa/rkisp1/ipa_context.h
@@ -62,6 +62,13 @@ struct IPAFrameContext {
bool updateParams;
} demosaicing;
+ struct {
+ int8_t brightness;
+ uint8_t contrast;
+ uint8_t saturation;
+ bool updateParams;
+ } cproc;
+
struct {
uint32_t exposure;
double gain;
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp
index aeec8f50..c664642f 100644
--- a/src/ipa/rkisp1/rkisp1.cpp
+++ b/src/ipa/rkisp1/rkisp1.cpp
@@ -31,6 +31,7 @@
#include "algorithms/algorithm.h"
#include "algorithms/awb.h"
#include "algorithms/blc.h"
+#include "algorithms/cproc.h"
#include "algorithms/demosaicing.h"
#include "algorithms/dpcc.h"
#include "algorithms/gsl.h"
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 4e000d31..de687f4d 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -972,6 +972,18 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)
std::forward_as_tuple(&controls::Sharpness),
std::forward_as_tuple(0.0f, 10.0f, 1.0f));
+ ctrls.emplace(std::piecewise_construct,
+ std::forward_as_tuple(&controls::Brightness),
+ std::forward_as_tuple(-1.0f, 0.993f));
+
+ ctrls.emplace(std::piecewise_construct,
+ std::forward_as_tuple(&controls::Contrast),
+ std::forward_as_tuple(0.0f, 1.993f));
+
+ ctrls.emplace(std::piecewise_construct,
+ std::forward_as_tuple(&controls::Saturation),
+ std::forward_as_tuple(0.0f, 1.993f));
+
ctrls.emplace(std::piecewise_construct,
std::forward_as_tuple(&controls::draft::NoiseReductionMode),
std::forward_as_tuple(controls::draft::NoiseReductionModeValues));
--
2.34.1
More information about the libcamera-devel
mailing list