{"id":16857,"url":"https://patchwork.libcamera.org/api/patches/16857/?format=json","web_url":"https://patchwork.libcamera.org/patch/16857/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220727222149.30627-10-laurent.pinchart@ideasonboard.com>","date":"2022-07-27T22:21:49","name":"[libcamera-devel,v5,9/9] ipa: rkisp1: Add support of ColorProcessing control","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"19e51ff0042a039a5c930058972e837a7b975bf2","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16857/mbox/","series":[{"id":3338,"url":"https://patchwork.libcamera.org/api/series/3338/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3338","date":"2022-07-27T22:21:40","name":"ipa: rkisp1: Add GSL, LSC, DPCC, Filter and CProc algorithms","version":5,"mbox":"https://patchwork.libcamera.org/series/3338/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16857/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16857/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5586FBE173\n\tfor ;\n\tWed, 27 Jul 2022 22:22:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F198863310;\n\tThu, 28 Jul 2022 00:22:10 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 199C163329\n\tfor ;\n\tThu, 28 Jul 2022 00:22:03 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A86F66D4;\n\tThu, 28 Jul 2022 00:22:02 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1658960531;\n\tbh=uldweqnyAfzDV0FN62EU5nftjSanqzRwCUqcxeREeXI=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=M6AgD8TGhARvAvO5MJ+SjpcOyACPQPIyqUjA18JqsadxQnK9KskLXxozqQN12Sh9b\n\tYCimF9BD6IqRVCCQEZUBR+ZUr/TtOThx/KdM+pOz1MglwDmFPdlpYXXzpXHoZ2M9yy\n\tEmi+R7ISxG2Cs4mTBjS5SSQuDbRI5jUZ0Wi3Ne+TtyF83ItSQy9Zd2GCRrZNpGN02A\n\tnYbB4qATl/FLPwMx5c5Ce1ng4JZvQNFdMAzPAhYP3OmOBxCfel3Zva/JbIEQ7Ok/kU\n\tmzGKK1Weqne2+nGKZyDtFBkXOsDtpggyJEieisl2JvT6gb3mQYOfGCSKG9Yp5q++x+\n\tSiP3Qr6V8fjBQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1658960522;\n\tbh=uldweqnyAfzDV0FN62EU5nftjSanqzRwCUqcxeREeXI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HR1zpXvDq6/vcfvulxOI+bZy71QY9Hy3Nq++0xOJpqujV4iSEahyl/bIYc02TbXrR\n\tsmUAma6Ogyn/m02+gvJReiwqgZ7+foHkp7addLPijdrgx/irE3egoPWMe12dPZjQLn\n\tYBPAIJ2vyxFOxwH7gDAk3jmMu1t2PaWvA/lAYh7M="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"HR1zpXvD\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 28 Jul 2022 01:21:49 +0300","Message-Id":"<20220727222149.30627-10-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220727222149.30627-1-laurent.pinchart@ideasonboard.com>","References":"<20220727222149.30627-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 9/9] ipa: rkisp1: Add support of\n\tColorProcessing control","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Florian Sylvestre \n\nAdd ColorProcessing algorithm that is in charge to manage brightness, contrast\nand saturation controls.\nThese controls are currently based on user controls.\n\nSigned-off-by: Florian Sylvestre \nReviewed-by: Laurent Pinchart \n---\n src/ipa/rkisp1/algorithms/cproc.cpp | 97 ++++++++++++++++++++++++\n src/ipa/rkisp1/algorithms/cproc.h | 30 ++++++++\n src/ipa/rkisp1/algorithms/meson.build | 1 +\n src/ipa/rkisp1/data/ov5640.yaml | 1 +\n src/ipa/rkisp1/ipa_context.cpp | 17 +++++\n src/ipa/rkisp1/ipa_context.h | 7 ++\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 12 +++\n 7 files changed, 165 insertions(+)\n create mode 100644 src/ipa/rkisp1/algorithms/cproc.cpp\n create mode 100644 src/ipa/rkisp1/algorithms/cproc.h","diff":"diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\nnew file mode 100644\nindex 000000000000..bca5ab6907d6\n--- /dev/null\n+++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n@@ -0,0 +1,97 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021-2022, Ideas On Board\n+ *\n+ * cproc.cpp - RkISP1 Color Processing control\n+ */\n+\n+#include \"cproc.h\"\n+\n+#include \n+#include \n+\n+#include \n+\n+#include \n+\n+/**\n+ * \\file cproc.h\n+ */\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp1::algorithms {\n+\n+/**\n+ * \\class ColorProcessing\n+ * \\brief RkISP1 Color Processing control\n+ *\n+ * The ColorProcessing algorithm is responsible for applying brightness,\n+ * contrast and saturation corrections. The values are directly provided\n+ * through requests by the corresponding controls.\n+ */\n+\n+LOG_DEFINE_CATEGORY(RkISP1CProc)\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::queueRequest\n+ */\n+void ColorProcessing::queueRequest(IPAContext &context,\n+\t\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t\t const ControlList &controls)\n+{\n+\tauto &cproc = context.frameContext.cproc;\n+\n+\tconst auto &brightness = controls.get(controls::Brightness);\n+\tif (brightness) {\n+\t\tcproc.brightness = std::clamp(std::lround(*brightness * 128), -128, 127);\n+\t\tcproc.updateParams = true;\n+\n+\t\tLOG(RkISP1CProc, Debug) << \"Set brightness to \" << *brightness;\n+\t}\n+\n+\tconst auto &contrast = controls.get(controls::Contrast);\n+\tif (contrast) {\n+\t\tcproc.contrast = std::clamp(std::lround(*contrast * 128), 0, 255);\n+\t\tcproc.updateParams = true;\n+\n+\t\tLOG(RkISP1CProc, Debug) << \"Set contrast to \" << *contrast;\n+\t}\n+\n+\tconst auto saturation = controls.get(controls::Saturation);\n+\tif (saturation) {\n+\t\tcproc.saturation = std::clamp(std::lround(*saturation * 128), 0, 255);\n+\t\tcproc.updateParams = true;\n+\n+\t\tLOG(RkISP1CProc, Debug) << \"Set saturation to \" << *saturation;\n+\t}\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::prepare\n+ */\n+void ColorProcessing::prepare(IPAContext &context,\n+\t\t\t rkisp1_params_cfg *params)\n+{\n+\tauto &cproc = context.frameContext.cproc;\n+\n+\t/* Check if the algorithm configuration has been updated. */\n+\tif (!cproc.updateParams)\n+\t\treturn;\n+\n+\tcproc.updateParams = false;\n+\n+\tparams->others.cproc_config.brightness = cproc.brightness;\n+\tparams->others.cproc_config.contrast = cproc.contrast;\n+\tparams->others.cproc_config.sat = cproc.saturation;\n+\n+\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_CPROC;\n+\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_CPROC;\n+\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_CPROC;\n+}\n+\n+REGISTER_IPA_ALGORITHM(ColorProcessing, \"ColorProcessing\")\n+\n+} /* namespace ipa::rkisp1::algorithms */\n+\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp1/algorithms/cproc.h b/src/ipa/rkisp1/algorithms/cproc.h\nnew file mode 100644\nindex 000000000000..4b7e4064d7e8\n--- /dev/null\n+++ b/src/ipa/rkisp1/algorithms/cproc.h\n@@ -0,0 +1,30 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021-2022, Ideas On Board\n+ *\n+ * cproc.h - RkISP1 Color Processing control\n+ */\n+\n+#pragma once\n+\n+#include \n+\n+#include \"algorithm.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::rkisp1::algorithms {\n+\n+class ColorProcessing : public Algorithm\n+{\n+public:\n+\tColorProcessing() = default;\n+\t~ColorProcessing() = default;\n+\n+\tvoid queueRequest(IPAContext &context, const uint32_t frame,\n+\t\t\t const ControlList &controls) override;\n+\tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+};\n+\n+} /* namespace ipa::rkisp1::algorithms */\n+} /* namespace libcamera */\ndiff --git a/src/ipa/rkisp1/algorithms/meson.build b/src/ipa/rkisp1/algorithms/meson.build\nindex dcd24fe07d23..e48974b454b5 100644\n--- a/src/ipa/rkisp1/algorithms/meson.build\n+++ b/src/ipa/rkisp1/algorithms/meson.build\n@@ -4,6 +4,7 @@ rkisp1_ipa_algorithms = files([\n 'agc.cpp',\n 'awb.cpp',\n 'blc.cpp',\n+ 'cproc.cpp',\n 'dpcc.cpp',\n 'filter.cpp',\n 'gsl.cpp',\ndiff --git a/src/ipa/rkisp1/data/ov5640.yaml b/src/ipa/rkisp1/data/ov5640.yaml\nindex 99529481f593..93d7d1e709d3 100644\n--- a/src/ipa/rkisp1/data/ov5640.yaml\n+++ b/src/ipa/rkisp1/data/ov5640.yaml\n@@ -10,6 +10,7 @@ algorithms:\n Gr: 256\n Gb: 256\n B: 256\n+ - ColorProcessing:\n - GammaSensorLinearization:\n x-intervals: [ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 ]\n y:\ndiff --git a/src/ipa/rkisp1/ipa_context.cpp b/src/ipa/rkisp1/ipa_context.cpp\nindex 4b1171865f1f..ef8bb8e931c8 100644\n--- a/src/ipa/rkisp1/ipa_context.cpp\n+++ b/src/ipa/rkisp1/ipa_context.cpp\n@@ -136,6 +136,23 @@ namespace libcamera::ipa::rkisp1 {\n * \\brief Estimated color temperature\n */\n \n+/**\n+ * \\var IPAFrameContext::cproc\n+ * \\brief Context for the Color Processing algorithm\n+ *\n+ * \\struct IPAFrameContext::cproc.brightness\n+ * \\brief Brightness level\n+ *\n+ * \\var IPAFrameContext::cproc.contrast\n+ * \\brief Contrast level\n+ *\n+ * \\var IPAFrameContext::cproc.saturation\n+ * \\brief Saturation level\n+ *\n+ * \\var IPAFrameContext::cproc.updateParams\n+ * \\brief Indicates if ISP parameters need to be updated\n+ */\n+\n /**\n * \\var IPAFrameContext::filter\n * \\brief Context for the Filter algorithm\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 3b2f6af1276f..2bdb6a81d7c9 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -57,6 +57,13 @@ struct IPAFrameContext {\n \t\tdouble temperatureK;\n \t} awb;\n \n+\tstruct {\n+\t\tint8_t brightness;\n+\t\tuint8_t contrast;\n+\t\tuint8_t saturation;\n+\t\tbool updateParams;\n+\t} cproc;\n+\n \tstruct {\n \t\tuint8_t denoise;\n \t\tuint8_t sharpness;\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 4e000d3122fb..de687f4dc6b0 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -972,6 +972,18 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \t\t std::forward_as_tuple(&controls::Sharpness),\n \t\t std::forward_as_tuple(0.0f, 10.0f, 1.0f));\n \n+\tctrls.emplace(std::piecewise_construct,\n+\t\t std::forward_as_tuple(&controls::Brightness),\n+\t\t std::forward_as_tuple(-1.0f, 0.993f));\n+\n+\tctrls.emplace(std::piecewise_construct,\n+\t\t std::forward_as_tuple(&controls::Contrast),\n+\t\t std::forward_as_tuple(0.0f, 1.993f));\n+\n+\tctrls.emplace(std::piecewise_construct,\n+\t\t std::forward_as_tuple(&controls::Saturation),\n+\t\t std::forward_as_tuple(0.0f, 1.993f));\n+\n \tctrls.emplace(std::piecewise_construct,\n \t\t std::forward_as_tuple(&controls::draft::NoiseReductionMode),\n \t\t std::forward_as_tuple(controls::draft::NoiseReductionModeValues));\n","prefixes":["libcamera-devel","v5","9/9"]}