From patchwork Wed Dec 17 10:01:22 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: 25583 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 0F404C3257 for ; Wed, 17 Dec 2025 10:02:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7D75D61EF2; Wed, 17 Dec 2025 11:02:07 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="n4Svz3os"; dkim-atps=neutral Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DA77961A62 for ; Wed, 17 Dec 2025 11:01:54 +0100 (CET) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4779cc419b2so55738595e9.3 for ; Wed, 17 Dec 2025 02:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765965714; x=1766570514; 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=dN8UZt6qlRDwenuDplOdpGWNKDU85eQ9zmywwDQb0Cg=; b=n4Svz3os/ZSF1ubDiTvqlnqNBDZeBk5MV/Vhmg0oh7nWIuExvYLC4uwNGJedbbnih6 nQ9HitrmFKHoHtv/A60DTYDZQY4XToefZ0H2qcXDs+F3nEqNhcGndKUxvxU7PQEJOi03 WaBIiOIr+KTTEyW4ETEQ6nKIvgakGbTrok45LnhAHDqIguw/A92ZkiKy6lFpkLwPomMW G3bTUPvBaA4Z4gE1joZmZ8URQmlQQSdh2z61tb6ZpSBHAGDYePMigJ+7WaSQlAHblISu uMTW2QyyVTqFPh3j6BDrOAnrCkTm1k0ohsnjFHKOSE2pIqCYA8RkGAhxIh0y87Yhx7aI Br9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765965714; x=1766570514; 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=dN8UZt6qlRDwenuDplOdpGWNKDU85eQ9zmywwDQb0Cg=; b=eGXW5vDpNILcPYsZZptIJ8HxLwwg7L6ty2rQPe5NPNYK3zuOTP72NPXD2B2SqYsz8k J2wcmT362Wix14kClf8R99sO6FrDcuzCbnQwH7rqgVA2gQkdPhd0uIIPWL0TSWJi5lA5 veTwqOp9N7LuNRaviDh9p3gI9niYmY83YX1fWHVdujoBkpXzZojfh4p+2tblfKx7bAD4 tbLvm+Qs5fY5j/NM6qkTLu9l5QfUSFzBkeY0VA2SSfQ6v9I/MdslUPMxr4JyoLS2cddJ RMxRH5/t793ob+jh27GAocdSuYaYOjpD8zfZV+j08QpX5ERD12gqoSsGCo/gCzDyweRP bMdw== X-Gm-Message-State: AOJu0YzpJ+DlPIPrvtrLFDpEOmPItOQ6+q+nRFHklw0CAuCOIhndF5Kd Ju+mQhRGfAJ+EdpK0B8surHXFu5W3xEd32slO/6hy/7K1AwZc5ExSGhmJnGHGi3Yx17XmVszXGu 5P79W X-Gm-Gg: AY/fxX57E85XbO0YQpLlLS3MpIfl/GjIRseiyYRM0A2XF6Qr8+i5ZaJps06qG81hgMJ ShDbU9N6jWbrYM48yOFTAJZosdQou/ct5UbBSp/tUSuhCxiZhV2JuaMui0y2ZBM2DYQvNNu6jCj pQ+hXdj3ZghmW/tOS1kSE/DexuPLvh5NXf3FnBGIubLLTLXwAMb6dVEN2UijgBm9kbPncA+KelA Gq6j8NdGlhBioCjcGqFDJn20N2DVcxzQ+U9QPtvZ1S1vSpxcof6u5cDUjI2asCAdObylUZPviXw um50imzco0imFseXmn/uBp43JnelnKWq7PUdm2Z2d449yezh4SyMzlx3/u0YJyRB0UAq1S9uH0g ECt5TOKcxej4SszLlc30GZ3goCZVSZzQeJYEdQe/XBBDF1NmvwaJLlJ407+BibezQA6fL6UD+Hr IoSxKI6mh0WMF4ip23w3f+xHq5T59tT0f5R2IpvYXoWVQAruSPuvhN+PH9FsoHU0D2qq9v0oQZ0 ER2rQ== X-Google-Smtp-Source: AGHT+IHT248ilUmvEhxuKRiaCo+h+yFbzkDYPSfpUx0aBzdzbV56JKyZ1hxs7fKMdo0wq1jQ0E7oHQ== X-Received: by 2002:a05:600c:1994:b0:477:a978:3a7b with SMTP id 5b1f17b1804b1-47a8f905675mr155006335e9.22.1765965714017; Wed, 17 Dec 2025 02:01:54 -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-47bdc1583fbsm32292585e9.0.2025.12.17.02.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 02:01:53 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Milan Zamazal Subject: [PATCH v9 10/26] libcamera: shaders: Add support for contrast Date: Wed, 17 Dec 2025 10:01:22 +0000 Message-ID: <20251217100138.82525-11-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251217100138.82525-1-bryan.odonoghue@linaro.org> References: <20251217100138.82525-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 Reviewed-by: Milan Zamazal --- src/libcamera/shaders/bayer_1x_packed.frag | 21 +++++++++++++++++++++ src/libcamera/shaders/bayer_unpacked.frag | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/libcamera/shaders/bayer_1x_packed.frag b/src/libcamera/shaders/bayer_1x_packed.frag index 77d9fbfa7..0b730070e 100644 --- a/src/libcamera/shaders/bayer_1x_packed.frag +++ b/src/libcamera/shaders/bayer_1x_packed.frag @@ -68,6 +68,16 @@ uniform sampler2D tex_y; uniform mat3 ccm; uniform vec3 blacklevel; uniform float gamma; +uniform float contrast; + +float apply_contrast(float value, float contrastExp) +{ + // Apply simple S-curve + if (value < 0.5) + return 0.5 * pow(value / 0.5, contrastExp); + else + return 1.0 - 0.5 * pow((1.0 - value) / 0.5, contrastExp); +} void main(void) { @@ -261,6 +271,17 @@ 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 + * contrastExp 0..2 contrast to 0..infinity; avoid actual infinity at tan(pi/2) + */ + float contrastExp = tan(clamp(contrast * 0.78539816339744830962, 0.0, 1.5707963267948966 - 0.00001)); + + rgb = clamp(rgb, 0.0, 1.0); + rgb.r = apply_contrast(rgb.r, contrastExp); + rgb.g = apply_contrast(rgb.g, contrastExp); + rgb.b = apply_contrast(rgb.b, contrastExp); + /* 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 aba11a87f..114e32058 100644 --- a/src/libcamera/shaders/bayer_unpacked.frag +++ b/src/libcamera/shaders/bayer_unpacked.frag @@ -27,6 +27,16 @@ varying vec4 xCoord; uniform mat3 ccm; uniform vec3 blacklevel; uniform float gamma; +uniform float contrast; + +float apply_contrast(float value, float contrastExp) +{ + // Apply simple S-curve + if (value < 0.5) + return 0.5 * pow(value / 0.5, contrastExp); + else + return 1.0 - 0.5 * pow((1.0 - value) / 0.5, contrastExp); +} void main(void) { vec3 rgb; @@ -156,6 +166,17 @@ 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 + * Convert 0..2 contrast to 0..infinity; avoid actual infinity at tan(pi/2) + */ + float contrastExp = tan(clamp(contrast * 0.78539816339744830962, 0.0, 1.5707963267948966 - 0.00001)); + + rgb = clamp(rgb, 0.0, 1.0); + rgb.r = apply_contrast(rgb.r, contrastExp); + rgb.g = apply_contrast(rgb.g, contrastExp); + rgb.b = apply_contrast(rgb.b, contrastExp); + /* Apply gamma after colour correction */ rgb = pow(rgb, vec3(gamma));