From patchwork Tue Jun 23 09:14:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 4142 Return-Path: Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 04834603BA for ; Tue, 23 Jun 2020 11:14:13 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="SnGbeJTc"; dkim-atps=neutral Received: by mail-wm1-x32e.google.com with SMTP id 22so1406199wmg.1 for ; Tue, 23 Jun 2020 02:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=joEFODcwaOC19f8VF6ejqcP6K1uDG+VNWSHaTK7PnEI=; b=SnGbeJTcBmDFwSRG2uUAULBDz+LXqOsol4qk+i6eVy2r+i6qfgVCjmjciV0VsvIaP0 vknjvfoztbQwmCSYSnHdnh9+irmBfZINQtUWR3XwLUaunQZl6rEZ54Le0ppQH0cxyqXO 15OnxY2LTC/7uM1taR8GPqr9dxwhpWu4YGdjvZnEFwK205D6osiImJS2ZQhZUIOJa5il 8DtFPkBxNg+MhRpaS5wIFBD3wAoMrVYsFWxyGw4KEHrxFFzZdcfoBygJAWeSUhcDKPNO ESM8DODbGUX6MvI7x7W1zWDLv/G6FFJxX1YOEtQzhnYPJLH4Yb93T08AJAlKrwvTSXsO HUBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=joEFODcwaOC19f8VF6ejqcP6K1uDG+VNWSHaTK7PnEI=; b=Q1D+bdZLVBZd2120ep3ihLNP9E921e+6/zXWhUT9CHnmibeO2tBWdWTmLOcjaF3cPh s8f4+jv8GWhWifx/oCUA7j4byFJiOCFhBvMazr9YK7m7XUYlcdpo1wnl7wD3YF3a7Xkg u/MhbEdaTnP8v7Of6uKs62fjR7CfwAREhvhLj6giUZfpdERBldpwbQXPXWAsA2FqAAS2 wezZEt4g7ri28ewQiuBGHq4i7rIiZq7oi0duYOyn2WqkjSp0gEdZt0WZB/zz8n0pMxHU VNn0iB1yLTVGoeXD6cTIliZ6b74X0tGJ0FEFZZ6bVfSJZzW2REAVp5fz6KVnQeehNlue KSuA== X-Gm-Message-State: AOAM533QvNFu7X47jXlDiS4ws3hg848UkUD3e71liSxoW7jRzm1I+hcC p5UrtXQOCTi+Gh+3HbzCqu/VggKd7f8= X-Google-Smtp-Source: ABdhPJxMWpEBOEhW2qFmT1QXfo+AZ3iQd7+DQNexSWw8NoAh7HdrE234DoBmQY9NrpqkqmV66NfEfA== X-Received: by 2002:a1c:2045:: with SMTP id g66mr22661517wmg.53.1592903652279; Tue, 23 Jun 2020 02:14:12 -0700 (PDT) Received: from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72]) by smtp.gmail.com with ESMTPSA id t125sm2931616wmf.10.2020.06.23.02.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 02:14:11 -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 Subject: [libcamera-devel] [PATCH v3 3/4] libcamera: ipa: raspberrypi: Add sharpness strength control X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jun 2020 09:14:13 -0000 The sharpness control is, loosely speaking, a gain applied to the amount of sharpening added to an image. We also report the sharpness setting used back to the caller in metadata. Signed-off-by: David Plowman Reviewed-by: Laurent Pinchart --- .../raspberrypi/controller/rpi/sharpen.cpp | 28 +++++++++++++++---- .../raspberrypi/controller/rpi/sharpen.hpp | 6 ++-- .../controller/sharpen_algorithm.hpp | 21 ++++++++++++++ .../raspberrypi/controller/sharpen_status.h | 2 ++ 4 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 src/ipa/raspberrypi/controller/sharpen_algorithm.hpp diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp index 4c2fdb3..3bae01f 100644 --- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp +++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp @@ -17,7 +17,7 @@ using namespace RPi; #define NAME "rpi.sharpen" Sharpen::Sharpen(Controller *controller) - : Algorithm(controller) + : SharpenAlgorithm(controller), user_strength_(1.0) { } @@ -42,14 +42,32 @@ void Sharpen::Read(boost::property_tree::ptree const ¶ms) limit_ = params.get("limit", 1.0); } +void Sharpen::SetStrength(double strength) +{ + // Note that this method is how an application sets the overall + // sharpening "strength". We call this the "user strength" field + // as there already is a strength_ field - being an internal gain + // parameter that gets passed to the ISP control code. Negative + // values are not allowed - coerce them to zero (no sharpening). + user_strength_ = std::max(0.0, strength); +} + void Sharpen::Prepare(Metadata *image_metadata) { + // The user_strength_ affects the algorithm's internal gain directly, but + // we adjust the limit and threshold less aggressively. Using a sqrt + // function is an arbitrary but gentle way of accomplishing this. + double user_strength_sqrt = sqrt(user_strength_); struct SharpenStatus status; // Binned modes seem to need the sharpening toned down with this - // pipeline. - status.threshold = threshold_ * mode_factor_; - status.strength = strength_ / mode_factor_; - status.limit = limit_ / mode_factor_; + // pipeline, thus we use the mode_factor here. Also avoid + // divide-by-zero with the user_strength_sqrt. + status.threshold = threshold_ * mode_factor_ / + std::max(0.01, user_strength_sqrt); + status.strength = strength_ / mode_factor_ * user_strength_; + status.limit = limit_ / mode_factor_ * user_strength_sqrt; + // Finally, report any application-supplied parameters that were used. + status.user_strength = user_strength_; image_metadata->Set("sharpen.status", status); } diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp index a3bf899..568521b 100644 --- a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp +++ b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp @@ -6,20 +6,21 @@ */ #pragma once -#include "../algorithm.hpp" +#include "../sharpen_algorithm.hpp" #include "../sharpen_status.h" // This is our implementation of the "sharpen algorithm". namespace RPi { -class Sharpen : public Algorithm +class Sharpen : public SharpenAlgorithm { public: Sharpen(Controller *controller); char const *Name() const override; void SwitchMode(CameraMode const &camera_mode, Metadata *metadata) override; void Read(boost::property_tree::ptree const ¶ms) override; + void SetStrength(double strength) override; void Prepare(Metadata *image_metadata) override; private: @@ -27,6 +28,7 @@ private: double strength_; double limit_; double mode_factor_; + double user_strength_; }; } // namespace RPi diff --git a/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp b/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp new file mode 100644 index 0000000..3b27a74 --- /dev/null +++ b/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2020, Raspberry Pi (Trading) Limited + * + * sharpen_algorithm.hpp - sharpness control algorithm interface + */ +#pragma once + +#include "algorithm.hpp" + +namespace RPi { + +class SharpenAlgorithm : public Algorithm +{ +public: + SharpenAlgorithm(Controller *controller) : Algorithm(controller) {} + // A sharpness control algorithm must provide the following: + virtual void SetStrength(double strength) = 0; +}; + +} // namespace RPi diff --git a/src/ipa/raspberrypi/controller/sharpen_status.h b/src/ipa/raspberrypi/controller/sharpen_status.h index 6de80f4..7501b19 100644 --- a/src/ipa/raspberrypi/controller/sharpen_status.h +++ b/src/ipa/raspberrypi/controller/sharpen_status.h @@ -19,6 +19,8 @@ struct SharpenStatus { double strength; // upper limit of the allowed sharpening response double limit; + // The sharpening strength requested by the user or application. + double user_strength; }; #ifdef __cplusplus