From patchwork Wed Sep 9 07:01:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "D. Manresa" X-Patchwork-Id: 28213 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 25337C3272 for ; Wed, 9 Sep 2026 07:01:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9DAB868637; Wed, 9 Sep 2026 09:01:51 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U283D7c4"; dkim-atps=neutral Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 405126863D for ; Wed, 9 Sep 2026 09:01:48 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-4843f205a5bso3471029f8f.1 for ; Wed, 09 Sep 2026 00:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788937307; x=1789542107; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8CImbtHLXUaMPFd2IhtB5hXgkV61KoJCzLcfGIp+Hmw=; b=U283D7c4Ui5DrKdpDmIRsM5zujcHmgj3Bl1Zvv4bkRyF/vcrZHSkFrRS8Ha33xnfUv azde7Z+rd8CbcJrrlqqu+EDZT9nPI45tpJR/9O/KoMKihrr4kbUc4FpERE1Vk+539VYs ve/oHDmgkrsMaWHPfTbCzGWNYnr/bEIb9Lq95lpjeW2xOiUsbZfziytXbIICP+VHKDqe FM5hmx9Ie0owILKAwaliNiXADunoHGzS2sQNW9+IUHKfDDiY8EyX7EYqmW1OFyVX24Qo nC7j9UK8F/UWLSteJ5lpKWBuEwVir0jcTE21gJFz9rZ/bR6t6CZiLhj0mImcv/ghxz4I 5BTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788937307; x=1789542107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=8CImbtHLXUaMPFd2IhtB5hXgkV61KoJCzLcfGIp+Hmw=; b=G2Dz2UZ6tDgqyXu250HF4X/sNgKhstK04lSdA/S6dph6qs8PK0dmF8+tZ1gCEfoHIB OwXUwB0ukBXCOYBi008omuBSOXllqtWhiW1Qy+//2DDy41e+8bNSR27UrPBABImgARCe Q4g9TC7/g1suaJE1QprKv70EBNmdE/4wptpk8ARkIn6tFD1934/BDTcZVyfIzP6Iei7e IRcuR52L4uN5Rdkm5pwXKIrQqbxUT6jYegKxYMfqGxkq7G7d7Sdb2yytgkDw50UEw9P4 PtK99FnCBlv+UY2mD79el8iKqODm7HGq8q68BpVczJc1n0EBb+coF3pJtGn1PlZfB3mQ QIgQ== X-Gm-Message-State: AFuF++nbCMR+nW/eDB40RCRoAJAgTHqKuw4NrW+NYUjorN1jG7s1kgt+ luSpi1kUMBS3zHICy8944Oo8iXUhfv10wAMecVNKthba3VEe0axtBKFWdggF9zakvA== X-Gm-Gg: AYBFou2IpxXIboVQByf0okHvwwoELjEvvAyzdU8dYLJopiF/dT3+xtTw4RVt12mACsu FuMNbVhJE0XJ3+XZU/F+8Wd4m74llgtGQgS+EkNBdcNl2/vOD8heDDXi4flut82Zr5wNVXIKJGz tXXNtexQjXsJ3FGifGiultElKk9eqQ2SvbumfNHct5XTCP+ouivCjgeU+tZ22YN9KAuJ7BLK0Gv 5uR8h6adet8xJzUTjtBta3zzSpdrR9Hdr/YH4eds8liezy1u8rmV2xGhPJBtZIABKs92S7kV/FP 45b0BIH8xS3OONfJgJy29llsgE+uke+t9coOur4oQLnM99GW+Wq+5B75bvQlv0QMJQ8X98O5Bdg ig7n1lenrk6cJSywoWVc2OUJbrRIJ72ZYCbgKGc7a9zzBRQlSPVlePkiqQucm5TuVz/CaEgHYFv zx4SKqhW/i2ZUEi24CSXTU0tzRmwxQcr3PQklDGsit/LULtqVntDENi5u89voqysuftoHCKTIgQ 8xCs4dL7Z3Vt+SidNUji+xphP6ccnrOfsp9L4W+xvi1I3mEMFDVBfs56jg= X-Received: by 2002:a05:6000:4816:b0:485:9bbc:ac72 with SMTP id ffacd0b85a97d-4859bbcb102mr17871546f8f.42.1788937307213; Wed, 09 Sep 2026 00:01:47 -0700 (PDT) Received: from latitude7275 (84.124.213.91.dyn.user.ono.com. [84.124.213.91]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48594172546sm33523472f8f.15.2026.09.09.00.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2026 00:01:46 -0700 (PDT) From: "D. Manresa" To: libcamera-devel@lists.libcamera.org Cc: Daniel Scally Subject: [PATCH 2/2] ipa: ipu3: Add a Sharpness algorithm Date: Wed, 9 Sep 2026 09:01:46 +0200 Message-ID: <20260909070146.18825-3-dmanresa@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909070146.18825-1-dmanresa@gmail.com> References: <20260909070146.18825-1-dmanresa@gmail.com> MIME-Version: 1.0 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The Image Enhancement Filter Directed (IEFD) block of the ImgU combines denoising with directional and unsharp-mask sharpening. It is the sharpening block that the ImgU firmware binaries actually run: none of them enables the Y_EE_NR edge enhancement accelerator, so programming that block has no effect. When IEFD is not programmed the driver enables it with a moderate default sharpening, and there is currently no way to change it. Add a Sharpness algorithm that programs the IEFD block with the driver defaults and scales the sharpening parameters (unsharp mask amount, directional sharpening weight and overshoot limits) by a sharpness factor: 1.0 keeps the driver behaviour, 0.0 disables the sharpening while keeping the denoising, and values up to 9.0 (where the unsharp mask amount saturates) sharpen more. The default comes from the optional 'sharpness' tuning parameter and can be changed at runtime with the Sharpness control, which is also reported in the metadata. Enable the algorithm in the uncalibrated tuning file; with the default value the output is unchanged. Measured on a Dell Latitude 7275 (OV5670, 1280x720 NV12, same scene): the standard deviation of the Laplacian of Y is 2.24, 2.47, 2.81 and 3.43 for sharpness 0.0, 1.0, 4.0 and 9.0, with the mean luminance and chroma unchanged. Signed-off-by: D. Manresa --- src/ipa/ipu3/algorithms/meson.build | 1 + src/ipa/ipu3/algorithms/sharpness.cpp | 208 ++++++++++++++++++++++++++ src/ipa/ipu3/algorithms/sharpness.h | 43 ++++++ src/ipa/ipu3/data/uncalibrated.yaml | 1 + src/ipa/ipu3/ipa_context.h | 9 ++ 5 files changed, 262 insertions(+) create mode 100644 src/ipa/ipu3/algorithms/sharpness.cpp create mode 100644 src/ipa/ipu3/algorithms/sharpness.h diff --git a/src/ipa/ipu3/algorithms/meson.build b/src/ipa/ipu3/algorithms/meson.build index 833583e..fd97330 100644 --- a/src/ipa/ipu3/algorithms/meson.build +++ b/src/ipa/ipu3/algorithms/meson.build @@ -8,5 +8,6 @@ ipu3_ipa_algorithms = files([ 'ccm.cpp', 'lsc.cpp', 'saturation.cpp', + 'sharpness.cpp', 'tone_mapping.cpp', ]) diff --git a/src/ipa/ipu3/algorithms/sharpness.cpp b/src/ipa/ipu3/algorithms/sharpness.cpp new file mode 100644 index 0000000..da26351 --- /dev/null +++ b/src/ipa/ipu3/algorithms/sharpness.cpp @@ -0,0 +1,208 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2026, D. Manresa + * + * IPU3 Sharpness control + */ + +#include "sharpness.h" + +#include +#include + +#include + +#include + +#include "libcamera/internal/value_node.h" + +/** + * \file sharpness.h + */ + +namespace libcamera { + +namespace ipa::ipu3::algorithms { + +/** + * \class Sharpness + * \brief Control of the sharpening through the ImgU IEFD block + * + * The Image Enhancement Filter Directed (IEFD) block of the ImgU combines + * denoising with a directional and an unsharp-mask sharpening. It is the + * sharpening block that the ImgU firmware binaries actually run: the Y_EE_NR + * edge enhancement block is never enabled by any of them, so programming it + * has no effect. + * + * When the IEFD block is not programmed the ImgU driver enables it with a + * moderate default sharpening. This algorithm programs the block with the + * same default configuration and scales the sharpening strength, that is the + * unsharp mask amount, the directional sharpening weight and the overshoot + * limits, by the requested sharpness. A value of 1.0 reproduces the driver + * defaults, 0.0 disables the sharpening while keeping the denoising active, + * and larger values sharpen more. + * + * The default sharpness is taken from the optional \a sharpness tuning + * parameter (1.0 if absent) and can be changed at runtime with the + * controls::Sharpness control. + */ + +LOG_DEFINE_CATEGORY(IPU3Sharpness) + +namespace { + +constexpr double kMinSharpness = 0.0; +/* The unsharp mask amount saturates at 511, 9 times the default of 56. */ +constexpr double kMaxSharpness = 9.0; + +/* clang-format off */ +/* imgu_css_iefd_defaults from the ImgU driver (ipu3-tables.c), reserved fields as 0 */ +static const struct ipu3_uapi_yuvp1_iefd_config kIefdDefaults = { + /* units */ { + /* cu_1 */ { 0, 150, 7, 0 }, + /* cu_ed */ { 7, 110, 244, 0, 307, 409, 511, 0, + 184, 255, 255, 0, 0, 0, 0, + 7, 81, 255, 0, 255, 255, 0 }, + /* cu_3 */ { 148, 251, 10, 0 }, + /* cu_5 */ { 25, 70, 501, 0, 32, 0 }, + /* cu_6 */ { 32, 63, 183, 0, 397, + 33, 0, 0, 0, + 0, 64, 0, 64, 0 }, + /* cu_7 */ { 200, 303, 10, 0 }, + /* cu_unsharp */ { 10, 64, 110, 0, 511, + 66, 12, 0, 0, + 0, 56, 0, 64, 0 }, + /* cu_radial */ { 6, 203, 255, 255, 255, 255, 0, + 84, 444, 397, 288, 300, 0, + 4, 69, 207, 0, 369, 448, 0 }, + /* cu_vssnlm */ { 61, 100, 25, 0 } + }, + /* config */ { 45, 0, 0, 0, 16, 0, 45, 0 }, + /* control */ { 1, 1, 1, 1, 1, 0 }, + /* sharp */ { { 50, 0, 511, 0, 50, 0, 50, 0 }, + { 64, 0, 0, 0, 0, 0 }, + { 56, 0, 56, 0 } }, + /* unsharp */ { { 36, 17, 8, 0 }, + { 13, 7, 3, 0 } }, + /* rad */ { { -2104, 0, -1559, 0 }, + { 4426816, 0 }, + { 2430481, 0 }, + { 6, 0, 79, 0 }, + { 64, 0, 0, 0 }, + { 1, 0, 2, 0, 0, 0, 0, 0 }, + { 40, 0, 62, 0 } }, + /* vsslnm */ { { 16, 32, 64, 0 }, + { 1, 0, 2, 0, 8, 0 } }, +}; +/* clang-format on */ + +uint32_t scaleU32(uint32_t value, double factor, uint32_t max) +{ + long scaled = std::lround(value * factor); + return std::clamp(scaled, 0, max); +} + +} /* namespace */ + +/** + * \copydoc libcamera::ipa::Algorithm::init + */ +int Sharpness::init(IPAContext &context, const ValueNode &tuningData) +{ + defaultSharpness_ = std::clamp(tuningData["sharpness"].get(1.0), + kMinSharpness, kMaxSharpness); + + context.ctrlMap[&controls::Sharpness] = + ControlInfo(static_cast(kMinSharpness), + static_cast(kMaxSharpness), + static_cast(defaultSharpness_)); + + return 0; +} + +/** + * \copydoc libcamera::ipa::Algorithm::configure + */ +int Sharpness::configure(IPAContext &context, + [[maybe_unused]] const IPAConfigInfo &configInfo) +{ + context.activeState.sharpness.value = defaultSharpness_; + + return 0; +} + +/** + * \copydoc libcamera::ipa::Algorithm::queueRequest + */ +void Sharpness::queueRequest(IPAContext &context, const uint32_t frame, + IPAFrameContext &frameContext, + const ControlList &controls) +{ + auto &sharpness = context.activeState.sharpness; + + frameContext.sharpness.update = frame == 0; + + const auto &value = controls.get(controls::Sharpness); + if (value) { + sharpness.value = std::clamp(*value, kMinSharpness, + kMaxSharpness); + frameContext.sharpness.update = true; + LOG(IPU3Sharpness, Debug) << "Set sharpness to " << sharpness.value; + } + + frameContext.sharpness.value = sharpness.value; +} + +/** + * \copydoc libcamera::ipa::Algorithm::prepare + * + * Program the IEFD block with the ImgU driver defaults, scaling the + * sharpening parameters by the sharpness of the frame. + */ +void Sharpness::prepare([[maybe_unused]] IPAContext &context, + [[maybe_unused]] const uint32_t frame, + IPAFrameContext &frameContext, + ipu3_uapi_params *params) +{ + if (!frameContext.sharpness.update) + return; + + const double sharpness = frameContext.sharpness.value; + struct ipu3_uapi_yuvp1_iefd_config &iefd = params->acc_param.iefd; + + iefd = kIefdDefaults; + + struct ipu3_uapi_yuvp1_iefd_shrp_cfg &sharp = iefd.sharp; + sharp.unshrp_cfg.unsharp_amount = + scaleU32(kIefdDefaults.sharp.unshrp_cfg.unsharp_amount, sharpness, 511); + sharp.far_w.dir_shrp = + scaleU32(kIefdDefaults.sharp.far_w.dir_shrp, sharpness, 64); + sharp.cfg.nega_lmt_txt = + scaleU32(kIefdDefaults.sharp.cfg.nega_lmt_txt, sharpness, 8191); + sharp.cfg.posi_lmt_txt = + scaleU32(kIefdDefaults.sharp.cfg.posi_lmt_txt, sharpness, 8191); + sharp.cfg.nega_lmt_dir = + scaleU32(kIefdDefaults.sharp.cfg.nega_lmt_dir, sharpness, 8191); + sharp.cfg.posi_lmt_dir = + scaleU32(kIefdDefaults.sharp.cfg.posi_lmt_dir, sharpness, 8191); + + params->use.acc_iefd = 1; +} + +/** + * \copydoc libcamera::ipa::Algorithm::process + */ +void Sharpness::process([[maybe_unused]] IPAContext &context, + [[maybe_unused]] const uint32_t frame, + IPAFrameContext &frameContext, + [[maybe_unused]] const ipu3_uapi_stats_3a *stats, + ControlList &metadata) +{ + metadata.set(controls::Sharpness, frameContext.sharpness.value); +} + +REGISTER_IPA_ALGORITHM(Sharpness, "Sharpness") + +} /* namespace ipa::ipu3::algorithms */ + +} /* namespace libcamera */ diff --git a/src/ipa/ipu3/algorithms/sharpness.h b/src/ipa/ipu3/algorithms/sharpness.h new file mode 100644 index 0000000..900fbf7 --- /dev/null +++ b/src/ipa/ipu3/algorithms/sharpness.h @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2026, D. Manresa + * + * IPU3 Sharpness control + */ + +#pragma once + +#include + +#include "algorithm.h" + +namespace libcamera { + +namespace ipa::ipu3::algorithms { + +class Sharpness : public Algorithm +{ +public: + Sharpness() = default; + ~Sharpness() = default; + + int init(IPAContext &context, const ValueNode &tuningData) override; + int configure(IPAContext &context, const IPAConfigInfo &configInfo) override; + void queueRequest(IPAContext &context, const uint32_t frame, + IPAFrameContext &frameContext, + const ControlList &controls) override; + void prepare(IPAContext &context, const uint32_t frame, + IPAFrameContext &frameContext, + ipu3_uapi_params *params) override; + void process(IPAContext &context, const uint32_t frame, + IPAFrameContext &frameContext, + const ipu3_uapi_stats_3a *stats, + ControlList &metadata) override; + +private: + double defaultSharpness_ = 1.0; +}; + +} /* namespace ipa::ipu3::algorithms */ + +} /* namespace libcamera */ diff --git a/src/ipa/ipu3/data/uncalibrated.yaml b/src/ipa/ipu3/data/uncalibrated.yaml index b7ab0d7..930d4ed 100644 --- a/src/ipa/ipu3/data/uncalibrated.yaml +++ b/src/ipa/ipu3/data/uncalibrated.yaml @@ -10,4 +10,5 @@ algorithms: - Ccm: - ToneMapping: - Saturation: + - Sharpness: ... diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h index 76147e3..860655e 100644 --- a/src/ipa/ipu3/ipa_context.h +++ b/src/ipa/ipu3/ipa_context.h @@ -59,6 +59,10 @@ struct IPAActiveState { struct { double value; } saturation; + + struct { + double value; + } sharpness; }; struct IPAFrameContext : public FrameContext { @@ -77,6 +81,11 @@ struct IPAFrameContext : public FrameContext { double value; bool update; } saturation; + + struct { + double value; + bool update; + } sharpness; }; struct IPAContext {