{"id":4142,"url":"https://patchwork.libcamera.org/api/patches/4142/?format=json","web_url":"https://patchwork.libcamera.org/patch/4142/","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":"<20200623091404.15155-4-david.plowman@raspberrypi.com>","date":"2020-06-23T09:14:03","name":"[libcamera-devel,v3,3/4] libcamera: ipa: raspberrypi: Add sharpness strength control","commit_ref":"0dbc6a507c682db1590105765119b7fa59f6493e","pull_url":null,"state":"accepted","archived":false,"hash":"96e0d4ff38a50207de829461f03bcd1ae01e0b79","submitter":{"id":42,"url":"https://patchwork.libcamera.org/api/people/42/?format=json","name":"David Plowman","email":"david.plowman@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/4142/mbox/","series":[{"id":1029,"url":"https://patchwork.libcamera.org/api/series/1029/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1029","date":"2020-06-23T09:14:00","name":"libcamera sharpness strength control","version":3,"mbox":"https://patchwork.libcamera.org/series/1029/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/4142/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/4142/checks/","tags":{},"headers":{"Return-Path":"","Received":["from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com\n\t[IPv6:2a00:1450:4864:20::32e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 04834603BA\n\tfor ;\n\tTue, 23 Jun 2020 11:14:13 +0200 (CEST)","by mail-wm1-x32e.google.com with SMTP id 22so1406199wmg.1\n\tfor ;\n\tTue, 23 Jun 2020 02:14:13 -0700 (PDT)","from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tt125sm2931616wmf.10.2020.06.23.02.14.11\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 23 Jun 2020 02:14:11 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"SnGbeJTc\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=joEFODcwaOC19f8VF6ejqcP6K1uDG+VNWSHaTK7PnEI=;\n\tb=SnGbeJTcBmDFwSRG2uUAULBDz+LXqOsol4qk+i6eVy2r+i6qfgVCjmjciV0VsvIaP0\n\tvknjvfoztbQwmCSYSnHdnh9+irmBfZINQtUWR3XwLUaunQZl6rEZ54Le0ppQH0cxyqXO\n\t15OnxY2LTC/7uM1taR8GPqr9dxwhpWu4YGdjvZnEFwK205D6osiImJS2ZQhZUIOJa5il\n\t8DtFPkBxNg+MhRpaS5wIFBD3wAoMrVYsFWxyGw4KEHrxFFzZdcfoBygJAWeSUhcDKPNO\n\tESM8DODbGUX6MvI7x7W1zWDLv/G6FFJxX1YOEtQzhnYPJLH4Yb93T08AJAlKrwvTSXsO\n\tHUBg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=joEFODcwaOC19f8VF6ejqcP6K1uDG+VNWSHaTK7PnEI=;\n\tb=Q1D+bdZLVBZd2120ep3ihLNP9E921e+6/zXWhUT9CHnmibeO2tBWdWTmLOcjaF3cPh\n\ts8f4+jv8GWhWifx/oCUA7j4byFJiOCFhBvMazr9YK7m7XUYlcdpo1wnl7wD3YF3a7Xkg\n\tu/MhbEdaTnP8v7Of6uKs62fjR7CfwAREhvhLj6giUZfpdERBldpwbQXPXWAsA2FqAAS2\n\twezZEt4g7ri28ewQiuBGHq4i7rIiZq7oi0duYOyn2WqkjSp0gEdZt0WZB/zz8n0pMxHU\n\tVNn0iB1yLTVGoeXD6cTIliZ6b74X0tGJ0FEFZZ6bVfSJZzW2REAVp5fz6KVnQeehNlue\n\tKSuA==","X-Gm-Message-State":"AOAM533QvNFu7X47jXlDiS4ws3hg848UkUD3e71liSxoW7jRzm1I+hcC\n\tp5UrtXQOCTi+Gh+3HbzCqu/VggKd7f8=","X-Google-Smtp-Source":"ABdhPJxMWpEBOEhW2qFmT1QXfo+AZ3iQd7+DQNexSWw8NoAh7HdrE234DoBmQY9NrpqkqmV66NfEfA==","X-Received":"by 2002:a1c:2045:: with SMTP id\n\tg66mr22661517wmg.53.1592903652279; \n\tTue, 23 Jun 2020 02:14:12 -0700 (PDT)","From":"David Plowman ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 23 Jun 2020 10:14:03 +0100","Message-Id":"<20200623091404.15155-4-david.plowman@raspberrypi.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200623091404.15155-1-david.plowman@raspberrypi.com>","References":"<20200623091404.15155-1-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 3/4] libcamera: ipa: raspberrypi: Add\n\tsharpness strength 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","X-List-Received-Date":"Tue, 23 Jun 2020 09:14:13 -0000"},"content":"The sharpness control is, loosely speaking, a gain applied to\nthe amount of sharpening added to an image. We also report the\nsharpness setting used back to the caller in metadata.\n\nSigned-off-by: David Plowman \n---\n .../raspberrypi/controller/rpi/sharpen.cpp | 28 +++++++++++++++----\n .../raspberrypi/controller/rpi/sharpen.hpp | 6 ++--\n .../controller/sharpen_algorithm.hpp | 21 ++++++++++++++\n .../raspberrypi/controller/sharpen_status.h | 2 ++\n 4 files changed, 50 insertions(+), 7 deletions(-)\n create mode 100644 src/ipa/raspberrypi/controller/sharpen_algorithm.hpp","diff":"diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\nindex 4c2fdb3..3bae01f 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp\n@@ -17,7 +17,7 @@ using namespace RPi;\n #define NAME \"rpi.sharpen\"\n \n Sharpen::Sharpen(Controller *controller)\n-\t: Algorithm(controller)\n+\t: SharpenAlgorithm(controller), user_strength_(1.0)\n {\n }\n \n@@ -42,14 +42,32 @@ void Sharpen::Read(boost::property_tree::ptree const ¶ms)\n \tlimit_ = params.get(\"limit\", 1.0);\n }\n \n+void Sharpen::SetStrength(double strength)\n+{\n+\t// Note that this method is how an application sets the overall\n+\t// sharpening \"strength\". We call this the \"user strength\" field\n+\t// as there already is a strength_ field - being an internal gain\n+\t// parameter that gets passed to the ISP control code. Negative\n+\t// values are not allowed - coerce them to zero (no sharpening).\n+\tuser_strength_ = std::max(0.0, strength);\n+}\n+\n void Sharpen::Prepare(Metadata *image_metadata)\n {\n+\t// The user_strength_ affects the algorithm's internal gain directly, but\n+\t// we adjust the limit and threshold less aggressively. Using a sqrt\n+\t// function is an arbitrary but gentle way of accomplishing this.\n+\tdouble user_strength_sqrt = sqrt(user_strength_);\n \tstruct SharpenStatus status;\n \t// Binned modes seem to need the sharpening toned down with this\n-\t// pipeline.\n-\tstatus.threshold = threshold_ * mode_factor_;\n-\tstatus.strength = strength_ / mode_factor_;\n-\tstatus.limit = limit_ / mode_factor_;\n+\t// pipeline, thus we use the mode_factor here. Also avoid\n+\t// divide-by-zero with the user_strength_sqrt.\n+\tstatus.threshold = threshold_ * mode_factor_ /\n+\t\tstd::max(0.01, user_strength_sqrt);\n+\tstatus.strength = strength_ / mode_factor_ * user_strength_;\n+\tstatus.limit = limit_ / mode_factor_ * user_strength_sqrt;\n+\t// Finally, report any application-supplied parameters that were used.\n+\tstatus.user_strength = user_strength_;\n \timage_metadata->Set(\"sharpen.status\", status);\n }\n \ndiff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\nindex a3bf899..568521b 100644\n--- a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\n+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp\n@@ -6,20 +6,21 @@\n */\n #pragma once\n \n-#include \"../algorithm.hpp\"\n+#include \"../sharpen_algorithm.hpp\"\n #include \"../sharpen_status.h\"\n \n // This is our implementation of the \"sharpen algorithm\".\n \n namespace RPi {\n \n-class Sharpen : public Algorithm\n+class Sharpen : public SharpenAlgorithm\n {\n public:\n \tSharpen(Controller *controller);\n \tchar const *Name() const override;\n \tvoid SwitchMode(CameraMode const &camera_mode, Metadata *metadata) override;\n \tvoid Read(boost::property_tree::ptree const ¶ms) override;\n+\tvoid SetStrength(double strength) override;\n \tvoid Prepare(Metadata *image_metadata) override;\n \n private:\n@@ -27,6 +28,7 @@ private:\n \tdouble strength_;\n \tdouble limit_;\n \tdouble mode_factor_;\n+\tdouble user_strength_;\n };\n \n } // namespace RPi\ndiff --git a/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp b/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp\nnew file mode 100644\nindex 0000000..3b27a74\n--- /dev/null\n+++ b/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp\n@@ -0,0 +1,21 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi (Trading) Limited\n+ *\n+ * sharpen_algorithm.hpp - sharpness control algorithm interface\n+ */\n+#pragma once\n+\n+#include \"algorithm.hpp\"\n+\n+namespace RPi {\n+\n+class SharpenAlgorithm : public Algorithm\n+{\n+public:\n+\tSharpenAlgorithm(Controller *controller) : Algorithm(controller) {}\n+\t// A sharpness control algorithm must provide the following:\n+\tvirtual void SetStrength(double strength) = 0;\n+};\n+\n+} // namespace RPi\ndiff --git a/src/ipa/raspberrypi/controller/sharpen_status.h b/src/ipa/raspberrypi/controller/sharpen_status.h\nindex 6de80f4..7501b19 100644\n--- a/src/ipa/raspberrypi/controller/sharpen_status.h\n+++ b/src/ipa/raspberrypi/controller/sharpen_status.h\n@@ -19,6 +19,8 @@ struct SharpenStatus {\n \tdouble strength;\n \t// upper limit of the allowed sharpening response\n \tdouble limit;\n+\t// The sharpening strength requested by the user or application.\n+\tdouble user_strength;\n };\n \n #ifdef __cplusplus\n","prefixes":["libcamera-devel","v3","3/4"]}