From patchwork Wed Dec 10 00:53:38 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: 25427 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 DD732C3257 for ; Wed, 10 Dec 2025 00:54:44 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9DA986146C; Wed, 10 Dec 2025 01:54:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="S+/bpJv0"; dkim-atps=neutral Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A33756144E for ; Wed, 10 Dec 2025 01:54:43 +0100 (CET) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-7aa2170adf9so5242854b3a.0 for ; Tue, 09 Dec 2025 16:54:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765328082; x=1765932882; 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=6jMRVHzcG6H3MVoD6kRHlh/HsNgMJfbon1fvfVhm+Ns=; b=S+/bpJv0OEzTE5t3znoJuAg5MgDY2uR6LTsg9lRsVS/vJRHGPM9vH3iZhB7x5MNPLo qUR8GDVDpa8G41Fh/cftK7FxqGiE/Pseuq50W4zAGdipULnlpZTc2QGGTUvrEs5Q9OP1 KwCxzn/7U5O+pFiaD8HtCYlnGNv3cTfWX1SS1NpkQUdEi/bp4pkOQnsVIRoMOhApDLMU QLDXmpaf/uRRWLlkWIuIBHbBquQCMGAHdFsCkNJ6jKAihW5VetweFeYdTeP9makR+IvV COlMZyk218jF5ISyeIhULgnlqfX4xgImvgGYalqX2v8ph7txwIzdJ5SA9U9PBvwu0LhA 3GRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765328082; x=1765932882; 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=6jMRVHzcG6H3MVoD6kRHlh/HsNgMJfbon1fvfVhm+Ns=; b=dB1Xo1NTK29Za9HPRs7kLeRwEGQ6s6qRj66AiCqn2whzA02Sg6++WYHLde4Q6UXMhc UmFtprkcKxoCdLAgG61ez+d6LHaUoXCLcfZG5O2u/OdjjSVhUM5H3e08mQ/F729dvhp/ 9oKw9p81p032cF6AS2+4MZp2MGzp9RNKYAh2DF47f8RRBQNbQdwk3GTqHatTlLUG+uAR bUqPhErFo8/D8x8TlnVTP/c94NDL5TWjzIMzGJnfxTaOHnmKYbT00ZgCpl3bVBTneN+m 6qif2Wq1Dg+GHE60tj+Vb6IBjQw8CJyt6mwGmZ2rNl3KEw7bDE5jjYtlPM7naA7OZJI9 amcA== X-Gm-Message-State: AOJu0Yy9tZrZhEGMgKbirzSCJpo0BuacL1dpbeWTJQr0g9OU1alvczVc g/cSZFF3JvTDNJMBQNck+iwam2h2S6Upejqd5o4/VhuhfIYXoEClUck8np8sLsCuE6Bd6hCMCxj kOBkx X-Gm-Gg: ASbGncvjsRcJmeGwty/yrrJI3HKOrLYaStOqHotF3Lq5Zf4MUMeT3XPJqz7aB3SBCgW euAkRpy1QTgN/jQVjej9jZeiAwDmh7zcGrjeRP66d8fs/RczReXbw88cEEMC+QACFoz7gidxXru 0ozFuCO0w82QCtcQEG4pBnuSw7XwvamOKEPZeklQRZYOvM820Ia0bV8o96D1n+1aVjL5PrGPdbV 4hSirxUbtSwiKdXEBRKMsw2+qh4ltPYkZsNAtwx9cvM92bx2gqiI1azfBt2G1Rlv3Lpy9UjETxp zvMDPhX0E/WiQoAyY/0v6FPAejkNXfDFCJsZHi3eAy2bY6B+sEz6CERMcKoiyW4XMwU7ngrwz3B DQMaYwyjLnFy/R5xdF0UZ3O7TZ8uBaZv0ST7aQTvNiOXlZCxYOev6nDFe8/aNvBsvAnYIZzSOVs 4x9CBqIyPxuRQ7Y2TmBUIjCRFmtQC5voXwo3VkrZubvGvkzJKP8ulhsW3QNnz5o1+j X-Google-Smtp-Source: AGHT+IEeSPSpK/rguyjCKRW2kAwlC7govDR4w678Ro82xhEEDy8BEmlUGZZG6CBFtMNs7l8C54n2uQ== X-Received: by 2002:a05:6a20:5483:b0:35f:6e12:186f with SMTP id adf61e73a8af0-366e07dacbamr530449637.23.1765328081907; Tue, 09 Dec 2025 16:54:41 -0800 (PST) Received: from inspiron14p-linux (p96936b06.osaknt01.ap.so-net.ne.jp. [150.147.107.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bf6875cc8eesm16057762a12.16.2025.12.09.16.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Dec 2025 16:54:41 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Milan Zamazal Subject: [PATCH v7 10/26] libcamera: shaders: Add support for contrast Date: Wed, 10 Dec 2025 00:53:38 +0000 Message-ID: <20251210005354.44726-11-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251210005354.44726-1-bryan.odonoghue@linaro.org> References: <20251210005354.44726-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 77d9fbfa7..eea237dfc 100644 --- a/src/libcamera/shaders/bayer_1x_packed.frag +++ b/src/libcamera/shaders/bayer_1x_packed.frag @@ -68,6 +68,19 @@ uniform sampler2D tex_y; uniform mat3 ccm; uniform vec3 blacklevel; uniform float gamma; +uniform float contrast; + +float apply_contrast(float value) +{ + // 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)); + + // 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 +274,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); + rgb.g = apply_contrast(rgb.g); + rgb.b = apply_contrast(rgb.b); + /* 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..1226fe075 100644 --- a/src/libcamera/shaders/bayer_unpacked.frag +++ b/src/libcamera/shaders/bayer_unpacked.frag @@ -27,6 +27,19 @@ varying vec4 xCoord; uniform mat3 ccm; uniform vec3 blacklevel; uniform float gamma; +uniform float contrast; + +float apply_contrast(float value) +{ + // 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)); + + // 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 +169,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));