{"id":25134,"url":"https://patchwork.libcamera.org/api/1.1/patches/25134/?format=json","web_url":"https://patchwork.libcamera.org/patch/25134/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20251120233347.5046-11-bryan.odonoghue@linaro.org>","date":"2025-11-20T23:33:34","name":"[v4,10/23] libcamera: shaders: Add support for contrast","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"491277a5a07ef1e185093f98361c1da86df1fb83","submitter":{"id":175,"url":"https://patchwork.libcamera.org/api/1.1/people/175/?format=json","name":"Bryan O'Donoghue","email":"bryan.odonoghue@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25134/mbox/","series":[{"id":5600,"url":"https://patchwork.libcamera.org/api/1.1/series/5600/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5600","date":"2025-11-20T23:33:24","name":"Add GLES 2.0 GPUISP to libcamera","version":4,"mbox":"https://patchwork.libcamera.org/series/5600/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25134/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25134/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id DDA29BD80A\n\tfor ;\n\tThu, 20 Nov 2025 23:34:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 85E0D60AB7;\n\tFri, 21 Nov 2025 00:34:15 +0100 (CET)","from mail-wm1-x332.google.com (mail-wm1-x332.google.com\n\t[IPv6:2a00:1450:4864:20::332])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E37960AB6\n\tfor ;\n\tFri, 21 Nov 2025 00:34:12 +0100 (CET)","by mail-wm1-x332.google.com with SMTP id\n\t5b1f17b1804b1-477770019e4so13868375e9.3\n\tfor ;\n\tThu, 20 Nov 2025 15:34:12 -0800 (PST)","from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-42cb7fa3a81sm7984139f8f.26.2025.11.20.15.34.09\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 20 Nov 2025 15:34:10 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"j26uB8Ol\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1763681651; x=1764286451;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=+zNFNWqqCErC8Ch/EK/IOgEBm/xZ3w406eAq/j9ZXn4=;\n\tb=j26uB8OlBzNfZCRxkKdsOkTd704+5yd0lmr7vUNLIXFkVFJTkCTQQ9/2OHmT99h3/e\n\tIpsYuOWapidkNh2aKlRwNiCmVprTUss37hJ06OGB8+tsHAjlFLI2iGOZNGE/BVQXFDmr\n\tQMNe7LP9seLo8zkf117B4ecmXREWUP5+GIRPpp9/XUoZV7sdks3kZrSAuK+Qlj98cHTO\n\tWk082pgeReZ06G2fBZdaiiUfSGymuZ1PMuOjhvljdjTxie1wLYCQQB1j3ig5AeJ5esGl\n\thEJZACh9/HaoYIT8sZ1j6T4r//jlNKpFutk23DdkLHBmEVLfPKrdV45GHJ29OgFsvPnm\n\tz5ag==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1763681651; x=1764286451;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n\t:to:cc:subject:date:message-id:reply-to;\n\tbh=+zNFNWqqCErC8Ch/EK/IOgEBm/xZ3w406eAq/j9ZXn4=;\n\tb=YAw1QVTI0lu8w6XR7yfSb0eHUdbVtqV0OPjK/FS9GAdcaoxEdt3b9a2Bp7jkUn4m5S\n\tZ2NCuB07yZ4vbZB4yCjaCTySWSqnEnBC/7ERvov3YRXPMPSsQ6idK1hK9j0fdLVMlfYS\n\tskLzao0pX2/W6pCznmCTQpOK1DI+PityuWhfZCwGpQ6dyK7zzBrjjQObysLCg5o0tPdh\n\t1YuPcszdhWOlF76D9Unx6Mtiam5yvmlvmxayBcYukvzgYyIV2Zq28J6de0Ox0z3WPpmh\n\tayjTeVXTqADk+QSWwYbLYMZOmjjyuX6L7yK+okYQWi4c0hs7D52+/R7Ce44+I/Jux5ko\n\t+cRA==","X-Gm-Message-State":"AOJu0YwpuW7NbPmV7Htiqalo1wIURMb8avmfsn8MYN4yw+fOYXYkAdFD\n\tmotkHzEsNEsCLLKMIItb6+T41fedvNkW4KAzrcdTH5+EXtpusB6TOp5nWCNJKY2srLRrj2+FCED\n\tXcXzFmko=","X-Gm-Gg":"ASbGnctfd62/GR+rtlEHObDNZOuZhCbox/8BlHlznMb8rMIDkJBPwi+cA3RrHqr3wLe\n\tod4yT+lpPzaebagZK5voOMwNWwVgmcqYy9tzw7AneRpuPvfvlgq16vxIOso6wOVEaw1vQHBh7Vq\n\tC/vfiDBiknGbIprDdbQumyL+9YV4Yj9AGQuBS66jyk1CLHlvwefCWsX+TNs1yzYj3aHbzcA+eVd\n\tYsogmhVXZLlc8MJsEVXKw27ckQdXUiBgfkcD7e0jzHF3n007Wa4raiN0A3bJM8zxwS4qc2QJ7xY\n\tGD1zdNS6P1R8Q6jc9EAA2i7b6N5CmDyiFR9OJZDx1yMv0D65YBNS39qvBb2XEpUZXFRVdobDSkw\n\tK8oCm23Vi4DdBhzNqm7xBZL+ob3Nm2rqmL+SCGXgsYot5+M0kNPiMjH70g9NTsF4NfuB9B7Grk8\n\tIlTb4XzvgcGd9ROEaEfIncfJ0atuYSugFicW5hI9RIrZcR+41nZqj3BbRJgJUpvI+n36k=","X-Google-Smtp-Source":"AGHT+IETi4YtTjSl7/B9HEMOiZ/6yoOHfYyu0IADJryaAza1VauySKo30bX2PQkvl6ygayZsnFFOVA==","X-Received":"by 2002:a05:600c:1d01:b0:465:a51d:d4 with SMTP id\n\t5b1f17b1804b1-477c016bbe2mr3239775e9.6.1763681651380; \n\tThu, 20 Nov 2025 15:34:11 -0800 (PST)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"pavel@ucw.cz, Bryan O'Donoghue ,\n\tMilan 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","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Apply contrast after black-level and CCM operations.\n\nSuggested-by: Milan Zamazal \nSigned-off-by: Bryan O'Donoghue \n\n33905b0b43c989c89a177c0e27dcd1acc80e750a\n\nSigned-off-by: Bryan O'Donoghue \n---\n .../internal/shaders/bayer_1x_packed.frag | 19 +++++++++++++++++++\n .../internal/shaders/bayer_unpacked.frag | 19 +++++++++++++++++++\n 2 files changed, 38 insertions(+)","diff":"diff --git a/include/libcamera/internal/shaders/bayer_1x_packed.frag b/include/libcamera/internal/shaders/bayer_1x_packed.frag\nindex 069b880ff..741896d01 100644\n--- a/include/libcamera/internal/shaders/bayer_1x_packed.frag\n+++ b/include/libcamera/internal/shaders/bayer_1x_packed.frag\n@@ -71,6 +71,19 @@ uniform sampler2D blue_param;\n uniform mat3 ccm;\n uniform vec3 blacklevel;\n uniform float gamma;\n+uniform float contrast;\n+\n+float apply_contrast(float normalise, float contrast_in)\n+{\n+\t// Convert 0..2 contrast to 0..infinity; avoid actual infinity at tan(pi/2)\n+\tfloat contrastExp = tan(clamp(contrast_in * 0.78539816339744830962, 0.0, 1.5707963267948966 - 0.00001));\n+\n+\t// Apply simple S-curve\n+\tif (normalise < 0.5)\n+\t\treturn 0.5 * pow(normalise / 0.5, contrastExp);\n+\telse\n+\t\treturn 1.0 - 0.5 * pow((1.0 - normalise) / 0.5, contrastExp);\n+}\n \n void main(void)\n {\n@@ -266,6 +279,12 @@ void main(void)\n \trgb.g = (rin * ccm[1][0]) + (gin * ccm[1][1]) + (bin * ccm[1][2]);\n \trgb.b = (rin * ccm[2][0]) + (gin * ccm[2][1]) + (bin * ccm[2][2]);\n \n+\t/* Contrast */\n+\trgb = clamp(rgb, 0.0, 1.0);\n+\trgb.r = apply_contrast(rgb.r, contrast);\n+\trgb.g = apply_contrast(rgb.g, contrast);\n+\trgb.b = apply_contrast(rgb.b, contrast);\n+\n \t/* Apply gamma after colour correction */\n \trgb = pow(rgb, vec3(gamma));\n \ndiff --git a/include/libcamera/internal/shaders/bayer_unpacked.frag b/include/libcamera/internal/shaders/bayer_unpacked.frag\nindex 950a4733e..16262feb2 100644\n--- a/include/libcamera/internal/shaders/bayer_unpacked.frag\n+++ b/include/libcamera/internal/shaders/bayer_unpacked.frag\n@@ -30,6 +30,19 @@ varying vec4 xCoord;\n uniform mat3\t\tccm;\n uniform vec3\t\tblacklevel;\n uniform float\t\tgamma;\n+uniform float contrast;\n+\n+float apply_contrast(float normalise, float contrast_in)\n+{\n+\t// Convert 0..2 contrast to 0..infinity; avoid actual infinity at tan(pi/2)\n+\tfloat contrastExp = tan(clamp(contrast_in * 0.78539816339744830962, 0.0, 1.5707963267948966 - 0.00001));\n+\n+\t// Apply simple S-curve\n+\tif (normalise < 0.5)\n+\t\treturn 0.5 * pow(normalise / 0.5, contrastExp);\n+\telse\n+\t\treturn 1.0 - 0.5 * pow((1.0 - normalise) / 0.5, contrastExp);\n+}\n \n void main(void) {\n vec3 rgb;\n@@ -161,6 +174,12 @@ void main(void) {\n \trgb.g = (rin * ccm[1][0]) + (gin * ccm[1][1]) + (bin * ccm[1][2]);\n \trgb.b = (rin * ccm[2][0]) + (gin * ccm[2][1]) + (bin * ccm[2][2]);\n \n+\t/* Contrast */\n+\trgb = clamp(rgb, 0.0, 1.0);\n+\trgb.r = apply_contrast(rgb.r, contrast);\n+\trgb.g = apply_contrast(rgb.g, contrast);\n+\trgb.b = apply_contrast(rgb.b, contrast);\n+\n \t/* Apply gamma after colour correction */\n \trgb = pow(rgb, vec3(gamma));\n \n","prefixes":["v4","10/23"]}