From patchwork Tue Jun 23 09:14:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 4140 Return-Path: Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E88E5609A3 for ; Tue, 23 Jun 2020 11:14:09 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="JGeXiYV2"; dkim-atps=neutral Received: by mail-wm1-x342.google.com with SMTP id q15so620648wmj.2 for ; Tue, 23 Jun 2020 02:14:09 -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=lwuzQcP5NtV0Djz+8ybqG+xX95tfmuqC7ARVnlPnPCk=; b=JGeXiYV2YxmyDPElWowVbMs8jlDQMufQ9Hf7hIsN8DeAJfTg6oRa/XiAvTLrHP76PD tu4CWKa4WJWVzqCAwSyDSI3B7AyvLb0S7pmt0BEdNCVtmJ/vgQOvFLCFNqYf3qqo81gZ plyyGvWd2ZitulZd3bk7Foc5yD1jW+PD6JOJ0btBxeUg7kVLn6st24OKFEPzJaP2S/I2 3Ew0xuiOXsShFtmwNiVaRWAVanli4oi05Ycu2Vt6cxKorXxJbo96CZlv5ckxCddu2PUa 5x25wpvuQ0/Oghfc/gMVx6uZKtho9ijPfThxpr3carHNBLPdgCGU0VhF+4wQoEfAVNNp MKgA== 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=lwuzQcP5NtV0Djz+8ybqG+xX95tfmuqC7ARVnlPnPCk=; b=Wq1RaX4j2yF2Eh9TNjfzAwuceLsW9uyCxeojTk+8B+PoQzoK8jw3vUSfduHFfYp5mO ssmjqcD0FGRVzMDi+t7bwLcQK9uyuVUQ6ZWCBDvRPHQbQZpRlPcGnTK5zVXcT0ZeEdSn /Yfxx5t2ncDAFHvAI9V6hYE+yFJuvm1yGFF5q6iO1gZBkWJHm3Pnan4vePrWOIPbJlcI dnB5Nw/DxtTmJ+fIuWWq95OpcW6so4Da6L/TMS7iw720PDu5U8j20D2bWa8zW3d30IvN kAeRCB5scIMhUsGO7vDmBAuMKtCmyw3U3lOx3eO0oESTZfXdjOx0mhZ3Co/6+D4PHUvq RMOg== X-Gm-Message-State: AOAM531c3IvBZarn1zMBjG2z/75SAOu0kOwkKIOS0yyhQu1gJTmmQK14 58Yz1EupjfpSNqZph5NBd/DOD3I+YtE= X-Google-Smtp-Source: ABdhPJy0Y2gA/WXEjYsXua14B06mQIbEbEG1yEm4uA/20k8ePVdn8EGk85NsH/xlfYkPIGyTKXBcKA== X-Received: by 2002:a1c:1984:: with SMTP id 126mr21784328wmz.147.1592903649383; Tue, 23 Jun 2020 02:14:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 02:14:08 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Tue, 23 Jun 2020 10:14:01 +0100 Message-Id: <20200623091404.15155-2-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 1/4] libcamera: Add a 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:10 -0000 The control is a single float value with minimum, default and maximum values. Please read the description for more details. Signed-off-by: David Plowman --- src/libcamera/control_ids.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/libcamera/control_ids.yaml b/src/libcamera/control_ids.yaml index 77ebc3f..8c3e4c7 100644 --- a/src/libcamera/control_ids.yaml +++ b/src/libcamera/control_ids.yaml @@ -239,4 +239,16 @@ controls: pixel range (as if pixels ranged from 0 to 65535). The SensorBlackLevels control can only be returned in metadata. size: [4] + + - Sharpness: + type: float + description: | + A value of 0.0 means no sharpening. The minimum value means + minimal sharpening, and shall be 0.0 unless the camera can't + disable sharpening completely. The default value shall give a + "reasonable" level of sharpening, suitable for most use cases. + The maximum value may apply extremely high levels of sharpening, + higher than anyone could reasonably want. Negative values are + not allowed. Note also that sharpening is not applied to raw + streams. ... From patchwork Tue Jun 23 09:14:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 4141 Return-Path: Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BC9BC609C2 for ; Tue, 23 Jun 2020 11:14:11 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="r2F+CVGE"; dkim-atps=neutral Received: by mail-wm1-x329.google.com with SMTP id g21so2419828wmg.0 for ; Tue, 23 Jun 2020 02:14:11 -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=blzNJOKYHnrUW4DxPt8nCOhq186OUDTiJdxCE82eKU0=; b=r2F+CVGER/Q1cGEK1WHJ9F9Rt6lCFe55VJFaMe43Aq9kXVNXubgzKEI5f3wQjvwt40 8WXheColgZPPIpvZ+x9TOKIka8cmU8Z1xXykTJmhuASVpR2ICeF/w+KT3XnPk2TFTSzM 3ziF47812vQUxrnYIQ165tGpin13gh1+W1jQ+PbLjAGXN530ZAxwFygDza89mNKOwzPl 7sklbm2VmzEJDW+4/vQ3poF/1368mxCOt4tamFX5R+tDrUO23ZTda0d4GCxF2GQbCT4D 95TULs93ngre2i55rQYxhMI3mRbOs+2eSy71d08LJx/7jjwu7optv4+wprnvMFnZsRMn 9WsQ== 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=blzNJOKYHnrUW4DxPt8nCOhq186OUDTiJdxCE82eKU0=; b=I5eElgL4HW2FSFNgFyiEjPYLrbzGnZhS++uHeC1DFxZRFLrAJaR0b70hWXT/U/yMl5 fXsUkxqIu4+KfPA2m16CDuQ05F0vAt77FoRAJNx0kiV+61JXFSKpuDCx5uKsZk5fT3qv EfCKoS4POVbW2gM35c+PF6ffU5ge0jZnPuR5LzBQ1jIa7s28RbfW1l4sTWbQ0gKEIQbT 22dFK+UKFJpWAHWlKMKGLy9MRhm6ZT27/y0AGuuX/oqGyQNrxtVp1dbB29x13Iduh6EU CyJD3iPmcqwjZUPjcTv15oWo30j6nBpgAHYwE/3UYbOV277bPtG9Z3CMpj0bIT8Glt9m TD5A== X-Gm-Message-State: AOAM530c3BRy4omzsja7r4J7VDBZvFc5rNN0Ba9TN7NeVhPLvIYHhtZr l7pERcq0Qcb7DkY/LuGK5P9MWJhKKks= X-Google-Smtp-Source: ABdhPJz1bWZIBj+jvYKOtRSYQDfkZBlt43bCSgbr0cf8kyAJ5NA8cLpRM/FAi/UStBG+i+y7RtTy9w== X-Received: by 2002:a1c:3c1:: with SMTP id 184mr22244921wmd.40.1592903650869; Tue, 23 Jun 2020 02:14:10 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 02:14:10 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Tue, 23 Jun 2020 10:14:02 +0100 Message-Id: <20200623091404.15155-3-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 2/4] libcamera: ipa: raspberrypi: Make sharpening mode_factor an ordinary double 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 No need for it to be std::atomic as SwitchMode runs synchronously with Prepare. Signed-off-by: David Plowman --- src/ipa/raspberrypi/controller/rpi/sharpen.cpp | 7 +++---- src/ipa/raspberrypi/controller/rpi/sharpen.hpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp index 086952f..4c2fdb3 100644 --- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp +++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp @@ -44,13 +44,12 @@ void Sharpen::Read(boost::property_tree::ptree const ¶ms) void Sharpen::Prepare(Metadata *image_metadata) { - double mode_factor = mode_factor_; 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; + status.threshold = threshold_ * mode_factor_; + status.strength = strength_ / mode_factor_; + status.limit = limit_ / mode_factor_; 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 f871aa6..a3bf899 100644 --- a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp +++ b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp @@ -26,7 +26,7 @@ private: double threshold_; double strength_; double limit_; - std::atomic mode_factor_; + double mode_factor_; }; } // namespace RPi 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 From patchwork Tue Jun 23 09:14:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 4143 Return-Path: Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2C8F8603BA for ; Tue, 23 Jun 2020 11:14:14 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="PQK1AD7h"; dkim-atps=neutral Received: by mail-wm1-x341.google.com with SMTP id j18so2261542wmi.3 for ; Tue, 23 Jun 2020 02:14:14 -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=szZXl6QaV/4cRk25Zk5zyFZjAjLl0G9Vvu2sYyyNpS8=; b=PQK1AD7hL/a5xwomvk8/WvnAHXYRFTtU/iz73r5pnFlwWvXbcUJo13hDxACn0JWvZa Fc0bDQYYfg4XtiMwgCnNLnujNmY3yst7ha/N8EAvtzjTaDNjJkX2kqWb9tGftOT3Jtn3 oeAUwU7qlznkd5LZWTVd8BI3u8BgxeE94v9y+5ve4YrZyCNKmNj0uyeXA7OFrwIL5T2M GcEfWLz9HhxqsIn84dLEv0SWGFveA7lTv08ZNvt3rLtNzwPCkEXjWqdaqaNPHuhEGAJU 313C27DmC9kHCnlHo+3wzwhdr83UkZQMNYTsFyNhG8/LD50oqFl6QPfgO9i1g+CGMVpv oAsw== 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=szZXl6QaV/4cRk25Zk5zyFZjAjLl0G9Vvu2sYyyNpS8=; b=X2StBMjASNr86sxYw8YWVhfUupdXRyOJOK093KDwUpXE5SzIcCjcCK5opbAtEAQspL QxKx1itC1SNhN5yoJPruvDX8LTf7eu3PIMd0y6rOdW/bzD+K6gElCq9bJ1p0kazV+zp9 63drCmcDrFU/R0UBKVhjg5mz6BizFbdQMqVxk0fM78HTKZYPIcoSB7vBZ3LsWncWfseP kVwFEtX705RWrhdEIFBIp2WclX5WZvj1z9LChQGBJoLhSdVg3zvgTsNMbT8QCGyxwInO HypDUPcf/gyau0eN6ui63LvZYxmjj0HdKMxsdvZZ7+03/uGP+Pp/4rvr+NaqEDs+dKcb 6n9Q== X-Gm-Message-State: AOAM5305WwE02u+hm9c35lGC6IeTk65awlMnY53zU0NEOf2dO0KKRb1v 4i2tNVtmML5uh/p987G/QC/godrFQ5o= X-Google-Smtp-Source: ABdhPJxaXcGiDODwbcAaWs+EHYGtwgBt5GYEbE+9dE1HsOHv+Eof1u452eiNQOoswOuaGeCnCWxEHw== X-Received: by 2002:a1c:308:: with SMTP id 8mr21819050wmd.125.1592903653663; Tue, 23 Jun 2020 02:14:13 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 02:14:13 -0700 (PDT) From: David Plowman To: libcamera-devel@lists.libcamera.org Date: Tue, 23 Jun 2020 10:14:04 +0100 Message-Id: <20200623091404.15155-5-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 4/4] libcamera: ipa: raspberrypi: plumb in the libcamera sharpness 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:14 -0000 This simply wires up the libcamera sharpness control in the Raspberry Pi IPAs so that it controls the strength of the Raspberry Pi sharpness control algorithm. Signed-off-by: David Plowman --- include/libcamera/ipa/raspberrypi.h | 1 + src/ipa/raspberrypi/raspberrypi.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h index c109469..a18ce9a 100644 --- a/include/libcamera/ipa/raspberrypi.h +++ b/include/libcamera/ipa/raspberrypi.h @@ -51,6 +51,7 @@ static const ControlInfoMap RPiControls = { { &controls::Brightness, ControlInfo(-1.0f, 1.0f) }, { &controls::Contrast, ControlInfo(0.0f, 32.0f) }, { &controls::Saturation, ControlInfo(0.0f, 32.0f) }, + { &controls::Sharpness, ControlInfo(0.0f, 16.0f, 1.0f) }, }; } /* namespace libcamera */ diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 42c84b1..bc89ab5 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -47,6 +47,7 @@ #include "metadata.hpp" #include "noise_status.h" #include "sdn_status.h" +#include "sharpen_algorithm.hpp" #include "sharpen_status.h" namespace libcamera { @@ -633,6 +634,17 @@ void IPARPi::queueRequest(const ControlList &controls) break; } + case controls::SHARPNESS: { + RPi::SharpenAlgorithm *sharpen = dynamic_cast( + controller_.GetAlgorithm("sharpen")); + ASSERT(sharpen); + + sharpen->SetStrength(ctrl.second.get()); + libcameraMetadata_.set(controls::Sharpness, + ctrl.second.get()); + break; + } + default: LOG(IPARPI, Warning) << "Ctrl " << controls::controls.at(ctrl.first)->name()