From patchwork Thu Nov 27 02:37:25 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: 25247 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 9168EC0F2A for ; Thu, 27 Nov 2025 02:38:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3EF3E60AD0; Thu, 27 Nov 2025 03:38:12 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ICERSK2Q"; 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 3626560A8B for ; Thu, 27 Nov 2025 03:38:09 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-47118259fd8so2250385e9.3 for ; Wed, 26 Nov 2025 18:38:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764211088; x=1764815888; 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=/PZjb99W2l+LEd1sej3PwFkHQEZZRLTROogT00grB9Y=; b=ICERSK2Q3X7yYfO5KKlgjCrvYAN/njv9h32XsiGwIbSsmg7d9d2n8RuveMusd7gdWn SCnFAHj2bpO3Hd+2hil3HErRlpmU7z6CRyiM5aZDeid92fF7b0OrkFov9ra9NABHwKWy WGCU/OamP6dGzkU4RGUJuTWzFE5kMQnQoIGCwIeseL4wTkYjdEM3/zemu5GgadIndrzI gX9b0RBDc1giNJBUkg811Im0YL1ax90E9nYgKsiRCKmNGBpwyZ07Rux7Up/R+t0LwcC+ I/5reUgoCzNLg7TxhKkF/v1QoJgBJN5Vm4GJGumhQ+6jN75ZuGQkWvRHRCii72EVgubU 1smQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764211088; x=1764815888; 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=/PZjb99W2l+LEd1sej3PwFkHQEZZRLTROogT00grB9Y=; b=NkeFtFF5qsLHSzEZVkh7jOQIYv6/rHyfqa9+H6wEARE4wq6KErpZwXZtmUSbhzmORX B09u41z6PnI6eQnwVdToC8fuMo1dIQDI6QJPiRbqqOhrEOCIn8mEzdrWYA4a0ElT8CG0 o5pEqtXAAkPeyVFAusiYOhrGFJNUnyYKnxGaKojqHM5X9LkE7BcVDXMgwTZBipaUjWj5 nFkS21wZaT3PPMX3dexO4OKPLCZvkmhLRZD+azaWeDfM7lKDFOMd1IzcqqHY08BHms12 PK1+DamJKyemQnNflpqBWsw4Pz7ETJVb2zmU7O1TzkpyZbEjUmAe6+V/F5BqDCV7Oy/V 7dSQ== X-Gm-Message-State: AOJu0YwVM7GzsERN2cieKZHwRwG0+GVHqTZtDOtWJ4O3tgL4JXKmz860 YlNELw3cg3pBkDL5Ctznp5WoUGpt8neuocOHbkS2T13WlGWm6AuFROVchWiJazoPQCnF9ttvfLA xFUPYieU= X-Gm-Gg: ASbGncu4EhdC8qdA7pC6VYDrBGFAgzvz/B7gWRPeaZPMoyEWMmBJbZUPSFfgpFY2loS kSTZMgIHrqgIi/WxtLnuvBQsElyxjSy2fqg0zftajx3cSGP76seXOfjqbBGB1nN579tvw6mM715 9+oSiWZprW31fRqQtRJok8wx0SiGCVyehblP13UdWmyE+4rB8KT7DfwkJD5cR7qQfl9zvde5Bi7 Qrn8XoqP0HwVTmzqICtBhrOnpIPBeEujJsOP0rd4OArExcwA+hxMQ/R2lPL2DA9smPvAHH7IZeV EpNpowjldhLmwypDM01S2nRM5zSwZ2hpXiZdc3+39TiAN88eIZYQohs9HWw2RUuM6fReQ6aZJAs i81co8Uxh0dGQq3Flk3Rcbz2Wr2eUwjTOuAjmW6LhM47ql/ddg7zX03NI8T4a1kEkvkycsTzDHv rBKxZ1fHq+pgHz8NQKMiAah20eMhoPtRjzpyXzy3270ZkK6JIRc6jBSrEa59H31ZpBlhE= X-Google-Smtp-Source: AGHT+IED1IeoYlpP7jt3zgiKEDbrxcxz+fxhTOzb4FKxv5P69Hil4JGrPC7tl0dLP/0wHQWbzNVmuQ== X-Received: by 2002:a05:600c:6011:b0:477:abea:9028 with SMTP id 5b1f17b1804b1-47904ac44d6mr59225615e9.6.1764211088560; Wed, 26 Nov 2025 18:38:08 -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 5b1f17b1804b1-4790552c3c9sm58186345e9.0.2025.11.26.18.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 18:38:07 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Milan Zamazal Subject: [PATCH v5 10/24] libcamera: shaders: Add support for contrast Date: Thu, 27 Nov 2025 02:37:25 +0000 Message-ID: <20251127023739.179652-11-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251127023739.179652-1-bryan.odonoghue@linaro.org> References: <20251127023739.179652-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 --- src/libcamera/shaders/bayer_1x_packed.frag | 19 +++++++++++++++++++ src/libcamera/shaders/bayer_unpacked.frag | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/libcamera/shaders/bayer_1x_packed.frag b/src/libcamera/shaders/bayer_1x_packed.frag index 069b880ff..741896d01 100644 --- a/src/libcamera/shaders/bayer_1x_packed.frag +++ b/src/libcamera/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/src/libcamera/shaders/bayer_unpacked.frag b/src/libcamera/shaders/bayer_unpacked.frag index 86bf2c31c..43ed99e33 100644 --- a/src/libcamera/shaders/bayer_unpacked.frag +++ b/src/libcamera/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));