Patch Detail
Show a patch.
GET /api/1.1/patches/4111/?format=api
{ "id": 4111, "url": "https://patchwork.libcamera.org/api/1.1/patches/4111/?format=api", "web_url": "https://patchwork.libcamera.org/patch/4111/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20200622135550.10788-4-david.plowman@raspberrypi.com>", "date": "2020-06-22T13:55:49", "name": "[libcamera-devel,v2,3/4] libcamera: ipa: raspberrypi: add sharpness strength control to Raspberry Pi IPAs", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "17feaa00f4def93ff89d20507d02c3c7300f712e", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/1.1/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/4111/mbox/", "series": [ { "id": 1024, "url": "https://patchwork.libcamera.org/api/1.1/series/1024/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1024", "date": "2020-06-22T13:55:46", "name": "libcamera sharpness strength control", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1024/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/4111/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/4111/checks/", "tags": {}, "headers": { "Return-Path": "<david.plowman@raspberrypi.com>", "Received": [ "from mail-wm1-x334.google.com (mail-wm1-x334.google.com\n\t[IPv6:2a00:1450:4864:20::334])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 71D01603BE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 22 Jun 2020 15:56:04 +0200 (CEST)", "by mail-wm1-x334.google.com with SMTP id a6so81407wmm.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 22 Jun 2020 06:56:04 -0700 (PDT)", "from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tc201sm12742903wmd.4.2020.06.22.06.56.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 22 Jun 2020 06:56:03 -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=\"WsZWUddc\"; 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=nW9c2ksYEoDsz8NJt0X7yIsYj0lj12jB3k4kkfsUo/I=;\n\tb=WsZWUddc5hpKD6rbpOnt+GrtERhRRloDye32876qhYeOA1JqMBSv+yidNAILcgM6HV\n\t91bCoyFTr+BPitPSgc1m3a0twG4mE1/hU/IhaRnPqdpi6UkTsw6F52L2dDJg79COw+EC\n\tfyekegQMoLzfp5BthUQDjJ0we8P5WYT7EjOkvKc26qbJG84oFHvERBs/nzeYzi5dnXAp\n\tGjzaba1Ld4Hm6abEnZ7qUmk5btcEjZZlPaZkzgWWzXYl9ZnzGxz3HMx91dUMLT3HL+HF\n\tjxkM1viM9J6F4Q/9qW0DbGvNAsx2R79i2x2JiErJDqU1T0GUui7i/AIjG6WOeyoQjzHM\n\thhgg==", "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=nW9c2ksYEoDsz8NJt0X7yIsYj0lj12jB3k4kkfsUo/I=;\n\tb=lrFdivi05eCcXc4dyvy5MnfPQkSDjIJbKFI/coVwL+8yRnDDBXFnXix+HzYwtoIpp6\n\t5yU8jqmtssdwq6Q90ldjRTvT8KfBjKOq3zC2Z05392jDfX77+5CdcAir4AxNxe6NCChB\n\tiquWKtT7SC6P2Y76A4KsjmQ/pkzqapfYsstcQBG1FTI/cNCXKsyzfdlJ596bwQXf4CUO\n\txecXnVKFsHeIAzOUisVwfw3AzEOv/Tyxik/4T7lNRI4noAh6pb2AEPfFH8fps3OnPuvf\n\t1aFnWNuGGCIXBYhKMU+vpv2V88aYqpEvgZ4xFUeK1sFBpaA8Zqs0gmlLdF52v+dxAoe1\n\tSbSw==", "X-Gm-Message-State": "AOAM5302cBgXIB64eCQ3Y0tgO3IkX1PoyZCoKQlpb75bkS/6kN8LTxf2\n\tzXGKeVBz/k7pdU1otQrBiyNmTVAiCbI=", "X-Google-Smtp-Source": "ABdhPJx3S7RZbvysTtRxcn90bAAVSksko1Twic6w7w8Wd2/IRY5k3VLm/9VFfZdUTrQFbOExkw+b7Q==", "X-Received": "by 2002:a1c:1b90:: with SMTP id\n\tb138mr8233523wmb.21.1592834163853; \n\tMon, 22 Jun 2020 06:56:03 -0700 (PDT)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 22 Jun 2020 14:55:49 +0100", "Message-Id": "<20200622135550.10788-4-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200622135550.10788-1-david.plowman@raspberrypi.com>", "References": "<20200622135550.10788-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 3/4] libcamera: ipa: raspberrypi: add\n\tsharpness strength control to Raspberry Pi IPAs", "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>", "X-List-Received-Date": "Mon, 22 Jun 2020 13:56:04 -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 <david.plowman@raspberrypi.com>\n---\n .../raspberrypi/controller/rpi/sharpen.cpp | 30 +++++++++++++++----\n .../raspberrypi/controller/rpi/sharpen.hpp | 6 ++--\n .../controller/sharpen_algorithm.hpp | 21 +++++++++++++\n .../raspberrypi/controller/sharpen_status.h | 2 ++\n 4 files changed, 52 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..cd93529 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,34 @@ void Sharpen::Read(boost::property_tree::ptree const ¶ms)\n \tlimit_ = params.get<double>(\"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.\n+\tuser_strength_ = 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 = user_strength_;\n+\tif (user_strength < 0.0)\n+\t\tuser_strength = 0.0;\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..e9a71fd 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+\tstd::atomic<double> 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", "v2", "3/4" ] }