Patch Detail
Show a patch.
GET /api/patches/20050/?format=api
{ "id": 20050, "url": "https://patchwork.libcamera.org/api/patches/20050/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20050/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240516124150.219054-4-stefan.klug@ideasonboard.com>", "date": "2024-05-16T12:41:50", "name": "[3/3] pipeline: rkisp1: Implement gamma control", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "beb7250b7981bee4f40d19438e078b7c55081b4e", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20050/mbox/", "series": [ { "id": 4310, "url": "https://patchwork.libcamera.org/api/series/4310/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4310", "date": "2024-05-16T12:41:47", "name": "libcamera: Add gamma control for rkisp1", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4310/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20050/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20050/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 73E7BBDE6B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 16 May 2024 12:43:13 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1749263485;\n\tThu, 16 May 2024 14:43:13 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1A5846347C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 16 May 2024 14:43:11 +0200 (CEST)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:3fef:fa64:e35:24d4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A25DF9D5;\n\tThu, 16 May 2024 14:43:02 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Ssugqst0\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1715863382;\n\tbh=1dM5gDq2CRxvX58nohspzt7v2JBfH0OQcd62FSa0dhc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Ssugqst0kZsQSm4hKJFOmLDkBf28Fr7ND1FOKyCMnTV0stiu8T2L0Xyco9koLKpZq\n\tQjVCbQJL2MRSsANqd0P7npQYAnu37IfHwthxAnT1pePg/rfaYfS0QmDkCIp5UXqckp\n\tOcLZU8jUIIEZRxHgDe3EcvH1ShchvHMtz5xPbAE4=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>", "Subject": "[PATCH 3/3] pipeline: rkisp1: Implement gamma control", "Date": "Thu, 16 May 2024 14:41:50 +0200", "Message-Id": "<20240516124150.219054-4-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.40.1", "In-Reply-To": "<20240516124150.219054-1-stefan.klug@ideasonboard.com>", "References": "<20240516124150.219054-1-stefan.klug@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add support for the gamma control on the rkisp1. This was tested on\nan imx8mp.\n\nWhile at it, reorder the controls inside rkisp1.cpp alphabetically.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/goc.cpp | 74 ++++++++++++++++++++++++++-----\n src/ipa/rkisp1/algorithms/goc.h | 11 ++++-\n src/ipa/rkisp1/ipa_context.h | 4 ++\n src/ipa/rkisp1/rkisp1.cpp | 3 +-\n 4 files changed, 80 insertions(+), 12 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/goc.cpp b/src/ipa/rkisp1/algorithms/goc.cpp\nindex 1598d730..2c7cb8a8 100644\n--- a/src/ipa/rkisp1/algorithms/goc.cpp\n+++ b/src/ipa/rkisp1/algorithms/goc.cpp\n@@ -11,6 +11,8 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n+#include <libcamera/control_ids.h>\n+\n #include \"libcamera/internal/yaml_parser.h\"\n \n #include \"linux/rkisp1-config.h\"\n@@ -53,6 +55,41 @@ int Gamma::init([[maybe_unused]] IPAContext &context,\n \treturn 0;\n }\n \n+/**\n+ * \\brief Configure the Gamma given a configInfo\n+ * \\param[in] context The shared IPA context\n+ * \\param[in] configInfo The IPA configuration data\n+ *\n+ * \\return 0\n+ */\n+int Gamma::configure(IPAContext &context,\n+\t\t [[maybe_unused]] const IPACameraSensorInfo &configInfo)\n+{\n+\tcontext.activeState.gamma = 2.2;\n+\treturn 0;\n+}\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::queueRequest\n+ */\n+void Gamma::queueRequest([[maybe_unused]] IPAContext &context,\n+\t\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n+\t\t\t const ControlList &controls)\n+{\n+\tconst auto &gamma = controls.get(controls::Gamma);\n+\tif (gamma) {\n+\t\t/* \\todo This is not correct as it updates the current state with a\n+\t\t * future value. But it does no harm at the moment an allows us to\n+\t\t * track the last active gamma\n+\t\t */\n+\t\tcontext.activeState.gamma = *gamma;\n+\t\tLOG(RkISP1Gamma, Debug) << \"Set gamma to \" << *gamma;\n+\t}\n+\n+\tframeContext.gamma = context.activeState.gamma;\n+}\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::prepare\n */\n@@ -67,19 +104,36 @@ void Gamma::prepare([[maybe_unused]] IPAContext &context,\n \t\t\t 512, 512, 512, 512, 512, 0 };\n \tauto gamma_y = params->others.goc_config.gamma_y;\n \n-\tif (frame > 0)\n-\t\treturn;\n+\tif (frame == 0 || std::fabs(frameContext.gamma - gamma_) > 0.001) {\n+\t\tgamma_ = frameContext.gamma;\n+\n+\t\tint x = 0;\n+\t\tfor (int i = 0; i < RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10; i++) {\n+\t\t\tgamma_y[i] = std::pow(x / 4096.0, 1.0 / gamma_) * 1023.0;\n+\t\t\tx += segments[i];\n+\t\t}\n \n-\tint x = 0;\n-\tfor (int i = 0; i < RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10; i++) {\n-\t\tgamma_y[i] = std::pow(x / 4096.0, 1.0 / gamma_) * 1023.0;\n-\t\tx += segments[i];\n+\t\tparams->others.goc_config.mode = RKISP1_CIF_ISP_GOC_MODE_LOGARITHMIC;\n+\t\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_GOC;\n+\n+\t\t/* It is unclear why these bits need to be set more than once.\n+\t\t * Setting them only on frame 0 didn't apply gamma.\n+\t\t */\n+\t\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_GOC;\n+\t\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_GOC;\n \t}\n+}\n \n-\tparams->others.goc_config.mode = RKISP1_CIF_ISP_GOC_MODE_LOGARITHMIC;\n-\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_GOC;\n-\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_GOC;\n-\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_GOC;\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::process\n+ */\n+void Gamma::process([[maybe_unused]] IPAContext &context,\n+\t\t [[maybe_unused]] const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t [[maybe_unused]] const rkisp1_stat_buffer *stats,\n+\t\t ControlList &metadata)\n+{\n+\tmetadata.set(controls::Gamma, frameContext.gamma);\n }\n \n REGISTER_IPA_ALGORITHM(Gamma, \"Gamma\")\ndiff --git a/src/ipa/rkisp1/algorithms/goc.h b/src/ipa/rkisp1/algorithms/goc.h\nindex 3c83655b..c6414040 100644\n--- a/src/ipa/rkisp1/algorithms/goc.h\n+++ b/src/ipa/rkisp1/algorithms/goc.h\n@@ -20,12 +20,21 @@ public:\n \t~Gamma() = default;\n \n \tint init(IPAContext &context, const YamlObject &tuningData) override;\n+\tint configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n+\tvoid queueRequest(IPAContext &context,\n+\t\t\t const uint32_t frame,\n+\t\t\t IPAFrameContext &frameContext,\n+\t\t\t const ControlList &controls) override;\n \tvoid prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\n \t\t rkisp1_params_cfg *params) override;\n+\tvoid process(IPAContext &context, const uint32_t frame,\n+\t\t IPAFrameContext &frameContext,\n+\t\t const rkisp1_stat_buffer *stats,\n+\t\t ControlList &metadata) override;\n \n private:\n-\tfloat gamma_ = 2.2;\n+\tfloat gamma_;\n };\n \n } /* namespace ipa::rkisp1::algorithms */\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex bd02a7a2..5252e222 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -104,6 +104,8 @@ struct IPAActiveState {\n \t\tuint8_t denoise;\n \t\tuint8_t sharpness;\n \t} filter;\n+\n+\tdouble gamma;\n };\n \n struct IPAFrameContext : public FrameContext {\n@@ -146,6 +148,8 @@ struct IPAFrameContext : public FrameContext {\n \t\tuint32_t exposure;\n \t\tdouble gain;\n \t} sensor;\n+\n+\tdouble gamma;\n };\n \n struct IPAContext {\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 6687c91e..7364fd73 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -108,9 +108,10 @@ const IPAHwSettings ipaHwSettingsV12{\n const ControlInfoMap::Map rkisp1Controls{\n \t{ &controls::AeEnable, ControlInfo(false, true) },\n \t{ &controls::AwbEnable, ControlInfo(false, true) },\n-\t{ &controls::ColourGains, ControlInfo(0.0f, 3.996f, 1.0f) },\n \t{ &controls::Brightness, ControlInfo(-1.0f, 0.993f, 0.0f) },\n+\t{ &controls::ColourGains, ControlInfo(0.0f, 3.996f, 1.0f) },\n \t{ &controls::Contrast, ControlInfo(0.0f, 1.993f, 1.0f) },\n+\t{ &controls::Gamma, ControlInfo(0.1f, 10.0f, 2.2f) },\n \t{ &controls::Saturation, ControlInfo(0.0f, 1.993f, 1.0f) },\n \t{ &controls::Sharpness, ControlInfo(0.0f, 10.0f, 1.0f) },\n \t{ &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },\n", "prefixes": [ "3/3" ] }