From patchwork Thu Nov 20 23:33:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 25134 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 DDA29BD80A for ; Thu, 20 Nov 2025 23:34:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 85E0D60AB7; Fri, 21 Nov 2025 00:34:15 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="j26uB8Ol"; dkim-atps=neutral Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E37960AB6 for ; Fri, 21 Nov 2025 00:34:12 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-477770019e4so13868375e9.3 for ; Thu, 20 Nov 2025 15:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763681651; x=1764286451; 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; bh=+zNFNWqqCErC8Ch/EK/IOgEBm/xZ3w406eAq/j9ZXn4=; b=j26uB8OlBzNfZCRxkKdsOkTd704+5yd0lmr7vUNLIXFkVFJTkCTQQ9/2OHmT99h3/e IpsYuOWapidkNh2aKlRwNiCmVprTUss37hJ06OGB8+tsHAjlFLI2iGOZNGE/BVQXFDmr QMNe7LP9seLo8zkf117B4ecmXREWUP5+GIRPpp9/XUoZV7sdks3kZrSAuK+Qlj98cHTO Wk082pgeReZ06G2fBZdaiiUfSGymuZ1PMuOjhvljdjTxie1wLYCQQB1j3ig5AeJ5esGl hEJZACh9/HaoYIT8sZ1j6T4r//jlNKpFutk23DdkLHBmEVLfPKrdV45GHJ29OgFsvPnm z5ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763681651; x=1764286451; 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; bh=+zNFNWqqCErC8Ch/EK/IOgEBm/xZ3w406eAq/j9ZXn4=; b=YAw1QVTI0lu8w6XR7yfSb0eHUdbVtqV0OPjK/FS9GAdcaoxEdt3b9a2Bp7jkUn4m5S Z2NCuB07yZ4vbZB4yCjaCTySWSqnEnBC/7ERvov3YRXPMPSsQ6idK1hK9j0fdLVMlfYS skLzao0pX2/W6pCznmCTQpOK1DI+PityuWhfZCwGpQ6dyK7zzBrjjQObysLCg5o0tPdh 1YuPcszdhWOlF76D9Unx6Mtiam5yvmlvmxayBcYukvzgYyIV2Zq28J6de0Ox0z3WPpmh ayjTeVXTqADk+QSWwYbLYMZOmjjyuX6L7yK+okYQWi4c0hs7D52+/R7Ce44+I/Jux5ko +cRA== X-Gm-Message-State: AOJu0YwpuW7NbPmV7Htiqalo1wIURMb8avmfsn8MYN4yw+fOYXYkAdFD motkHzEsNEsCLLKMIItb6+T41fedvNkW4KAzrcdTH5+EXtpusB6TOp5nWCNJKY2srLRrj2+FCED XcXzFmko= X-Gm-Gg: ASbGnctfd62/GR+rtlEHObDNZOuZhCbox/8BlHlznMb8rMIDkJBPwi+cA3RrHqr3wLe od4yT+lpPzaebagZK5voOMwNWwVgmcqYy9tzw7AneRpuPvfvlgq16vxIOso6wOVEaw1vQHBh7Vq C/vfiDBiknGbIprDdbQumyL+9YV4Yj9AGQuBS66jyk1CLHlvwefCWsX+TNs1yzYj3aHbzcA+eVd YsogmhVXZLlc8MJsEVXKw27ckQdXUiBgfkcD7e0jzHF3n007Wa4raiN0A3bJM8zxwS4qc2QJ7xY GD1zdNS6P1R8Q6jc9EAA2i7b6N5CmDyiFR9OJZDx1yMv0D65YBNS39qvBb2XEpUZXFRVdobDSkw K8oCm23Vi4DdBhzNqm7xBZL+ob3Nm2rqmL+SCGXgsYot5+M0kNPiMjH70g9NTsF4NfuB9B7Grk8 IlTb4XzvgcGd9ROEaEfIncfJ0atuYSugFicW5hI9RIrZcR+41nZqj3BbRJgJUpvI+n36k= X-Google-Smtp-Source: AGHT+IETi4YtTjSl7/B9HEMOiZ/6yoOHfYyu0IADJryaAza1VauySKo30bX2PQkvl6ygayZsnFFOVA== X-Received: by 2002:a05:600c:1d01:b0:465:a51d:d4 with SMTP id 5b1f17b1804b1-477c016bbe2mr3239775e9.6.1763681651380; Thu, 20 Nov 2025 15:34:11 -0800 (PST) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42cb7fa3a81sm7984139f8f.26.2025.11.20.15.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 15:34:10 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Milan Zamazal Subject: [PATCH v4 10/23] libcamera: shaders: Add support for contrast Date: Thu, 20 Nov 2025 23:33:34 +0000 Message-ID: <20251120233347.5046-11-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251120233347.5046-1-bryan.odonoghue@linaro.org> References: <20251120233347.5046-1-bryan.odonoghue@linaro.org> 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" Apply contrast after black-level and CCM operations. Suggested-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue 33905b0b43c989c89a177c0e27dcd1acc80e750a Signed-off-by: Bryan O'Donoghue --- .../internal/shaders/bayer_1x_packed.frag | 19 +++++++++++++++++++ .../internal/shaders/bayer_unpacked.frag | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/libcamera/internal/shaders/bayer_1x_packed.frag b/include/libcamera/internal/shaders/bayer_1x_packed.frag index 069b880ff..741896d01 100644 --- a/include/libcamera/internal/shaders/bayer_1x_packed.frag +++ b/include/libcamera/internal/shaders/bayer_1x_packed.frag @@ -71,6 +71,19 @@ uniform sampler2D blue_param; uniform mat3 ccm; uniform vec3 blacklevel; uniform float gamma; +uniform float contrast; + +float apply_contrast(float normalise, float contrast_in) +{ + // Convert 0..2 contrast to 0..infinity; avoid actual infinity at tan(pi/2) + float contrastExp = tan(clamp(contrast_in * 0.78539816339744830962, 0.0, 1.5707963267948966 - 0.00001)); + + // Apply simple S-curve + if (normalise < 0.5) + return 0.5 * pow(normalise / 0.5, contrastExp); + else + return 1.0 - 0.5 * pow((1.0 - normalise) / 0.5, contrastExp); +} void main(void) { @@ -266,6 +279,12 @@ void main(void) rgb.g = (rin * ccm[1][0]) + (gin * ccm[1][1]) + (bin * ccm[1][2]); rgb.b = (rin * ccm[2][0]) + (gin * ccm[2][1]) + (bin * ccm[2][2]); + /* Contrast */ + rgb = clamp(rgb, 0.0, 1.0); + rgb.r = apply_contrast(rgb.r, contrast); + rgb.g = apply_contrast(rgb.g, contrast); + rgb.b = apply_contrast(rgb.b, contrast); + /* Apply gamma after colour correction */ rgb = pow(rgb, vec3(gamma)); diff --git a/include/libcamera/internal/shaders/bayer_unpacked.frag b/include/libcamera/internal/shaders/bayer_unpacked.frag index 950a4733e..16262feb2 100644 --- a/include/libcamera/internal/shaders/bayer_unpacked.frag +++ b/include/libcamera/internal/shaders/bayer_unpacked.frag @@ -30,6 +30,19 @@ varying vec4 xCoord; uniform mat3 ccm; uniform vec3 blacklevel; uniform float gamma; +uniform float contrast; + +float apply_contrast(float normalise, float contrast_in) +{ + // Convert 0..2 contrast to 0..infinity; avoid actual infinity at tan(pi/2) + float contrastExp = tan(clamp(contrast_in * 0.78539816339744830962, 0.0, 1.5707963267948966 - 0.00001)); + + // Apply simple S-curve + if (normalise < 0.5) + return 0.5 * pow(normalise / 0.5, contrastExp); + else + return 1.0 - 0.5 * pow((1.0 - normalise) / 0.5, contrastExp); +} void main(void) { vec3 rgb; @@ -161,6 +174,12 @@ void main(void) { rgb.g = (rin * ccm[1][0]) + (gin * ccm[1][1]) + (bin * ccm[1][2]); rgb.b = (rin * ccm[2][0]) + (gin * ccm[2][1]) + (bin * ccm[2][2]); + /* Contrast */ + rgb = clamp(rgb, 0.0, 1.0); + rgb.r = apply_contrast(rgb.r, contrast); + rgb.g = apply_contrast(rgb.g, contrast); + rgb.b = apply_contrast(rgb.b, contrast); + /* Apply gamma after colour correction */ rgb = pow(rgb, vec3(gamma));