From patchwork Fri Dec 12 00:29:21 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: 25525 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 8A8F7BD1F1 for ; Fri, 12 Dec 2025 00:33:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 42A906168E; Fri, 12 Dec 2025 01:33:58 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="hKteUxNY"; dkim-atps=neutral Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E42F261635 for ; Fri, 12 Dec 2025 01:33:55 +0100 (CET) Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-7e1651ae0d5so592164b3a.1 for ; Thu, 11 Dec 2025 16:33:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765499634; x=1766104434; 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=hKteUxNYqaFPD0AXzSSJCPoSWv5u4LGGq8fiYjz12DBEHslvpsV4yZGGO8acUR1g2/ gHHTf0iM2sYKvrsR9aEFaGtfq1aIqTmhryT6fej6HiFBoGOqZpKrOCDYqT3c3r89j+H7 DRiVRdO5OzlvblsDl/TNSX4vlw0gMcO7/VRvoFcohrignYH/83DDxIKE3KZOGe8cn6yp U3qMydgW/p1ZfAkmRMA8n/X3Sw0MeUDs2/dV7ZHIO86hoe1CkCVRbETEQ3p/fkWjnszJ WztF9twKrUFITUifJ+/7A1VAT8lV9jaUdps3xTqBfpEwAaFduU6Bwxu5KaktR0C2OM0p mchQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765499634; x=1766104434; 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=LZMgoVhGm5kVFseH1s8aBbHTM6PDaoddZLbkLB7HGPMUHAvQqquVgitrbrKxRAegE3 uvItCnePl3Y7Y8Thkx2nXFc01lAQ5Wf7S0dzW7hCWsEv1z/aym9X4eeyuQvLmr3h89U9 +O0Pq/x7xid83zQCtFNHe59iLFxjAdP00kJA0GOk6Spk95gp3M1Yd28Rfg1vWQM0ssSA RIxqkSaba1g4+mY1fuAGcac62Evusnet5pGuzWEcjO8z21lImBEgmHx08tlPlXuw6SlA DC+kkqqLKPGV5mmSnjhMP+hN9mgZeaLRJeXuHdb1ryX6xyIJlE/j3DwW6f42gHGJ77cN qNaA== X-Gm-Message-State: AOJu0YxmNR3LzhPhVMq3fdP5RpJrpzOK3FsVkGM/W8rzZPE++5HwQcSP 9N80VR0UHMgKp+QXZjWUkVgutFFOZ0ZCpRwjVEuX9t9GOt0hnRqFnuVsYo8+UfI61V8s4upC02k af/Jm X-Gm-Gg: AY/fxX6emuY6rFDiREVEX7sspcZvWp7tKweeHkUzHsC+LKWxAHawpZsjqSeYckMYnn2 VkzULQpVzvq6OzM7+xO5nIexHSK+QZdipbfwEbbym9ePQSNn5q3UNz0EZrTG9qQtpYDtV/+tdLt Px3QoA7IsgP/6illN7cU26ShzE3b9f78iHqcmBJ82oVEpyx85h+L5HgL/SSPpe5X3s4f3ZsuRpT 8lbPTuvsR4uGy8HuMGbGFovriywJtYI4gtIQU86wUXqGijflDm80KygmPxID6VmCZlXDW4mV68k 0CELlaM0ORT2cpz9rOJgNoyx6A3HyGgPQpE9HWRW5HDzqFtCh1OR+MWm6Nr+VKDkvGv+7H/J+vO ZjH1Iy31JoAK6Kqh0lrQQC3peGMhpO1uWIwd9xWLVDe8l5uG8hbFy4n9iCTDlAe/lNf2ACAJ7Of y1u6fZJGcsW4T5X/TQ/fm+6HgUg3QHqzcYGX0J0wej5ySB71s+IcaA32Kgo2HbB4s5CJlG8A== X-Google-Smtp-Source: AGHT+IFrlauqKahU3yInGY0OzEsCeCYb7WzxgMij7edjwKkoRIGg540bRyLP6D5+zDeouPgYSH0ETA== X-Received: by 2002:a05:6a20:6a21:b0:35f:27d:2ded with SMTP id adf61e73a8af0-369adfb33b3mr335863637.25.1765499634196; Thu, 11 Dec 2025 16:33:54 -0800 (PST) Received: from inspiron14p-linux (p99250-ipoefx.ipoe.ocn.ne.jp. [153.246.134.249]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c0c26eb0f6bsm3317282a12.14.2025.12.11.16.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Dec 2025 16:33:53 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Milan Zamazal Subject: [PATCH v8 10/26] libcamera: shaders: Add support for contrast Date: Fri, 12 Dec 2025 00:29:21 +0000 Message-ID: <20251212002937.3118-11-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251212002937.3118-1-bryan.odonoghue@linaro.org> References: <20251212002937.3118-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 | 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));