From patchwork Wed Dec 10 00:53:34 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: 25423 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 7E29FC3257 for ; Wed, 10 Dec 2025 00:54:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 37D7A6145B; Wed, 10 Dec 2025 01:54:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VSAwhN5Q"; dkim-atps=neutral Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B9EFE61455 for ; Wed, 10 Dec 2025 01:54:34 +0100 (CET) Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-343dfb673a8so6347441a91.0 for ; Tue, 09 Dec 2025 16:54:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765328073; x=1765932873; 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=Zkzu0tqbzAOlMWvnkw6w2p9R2Nid+3zoTkR/m4lKMgE=; b=VSAwhN5QX9uW4aUsbeQ3VNTKywC/gzNYoUCNntTFQyhBrz9JUTHeGM0nlQ6NaG5eKE AavCsjbUKFwY1PyRoOKZSKJ2f3lE/mPvW5IC2xGhKmNJZ523tmOTeLqd/+6A+DAkoTOY 5WUDIAOpx4TzW8D0z0umHo6JvbXvDFB1o4Swp8vVogyX5ixWJbxwaCv3r0GNIlGbhnrv 7GYDX1wUvIHullXktt3S7HexpOjTrC/TnwW1tv+XGQ0U/2mRgxLWQzX0JGXid8ZFFgYV SOcrHMOesl4Smt8JrryoKFQT8CZnVzVweTr8/awrcrfmEJwHvG/XyJUwZ8QCB+JvI1tS 14MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765328073; x=1765932873; 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=Zkzu0tqbzAOlMWvnkw6w2p9R2Nid+3zoTkR/m4lKMgE=; b=A0QRIRHBIb4TryBwNfdp+PepFahjkB/ElC9snyWC+MNiHzbUGDvWkpTK4M7A590qS1 hmG0zJvkZHmkQSuab7f0zobLGU8HJOzDtzSlSf6NJvSg4K9Rf/fUDJRflackNm80YZ8o aS1D6BFWDh+8QmGCCvHMM1oA0RKQMTAp8RWyPtzzQwFDALrist65SIesqq8/VhITm3BL n23G4Wl9O7A/tB0yua4KRhsNkuRtpgQc8yW5Xx2gfGOJzFUrLbCFpPBD6/mcGHqKw+B6 m8yylhhDMeV96LvV2lQU4vgWxbfKKNNpdP2r75GwoEaDOywmQq6peW46H00icE2HwmMB LkIA== X-Gm-Message-State: AOJu0YzqMnDHvnsCHzywaJQpSW1AevWhZZ/TowADzz2Z2ToUMIQ7toBe kl1s3vx3+felrcXkgHWlZhbLgWNgU4L6GeyUeJLTtefkEqky2MKsBVgI+/24bgrURIt6nGQ9X8d ZyFmN X-Gm-Gg: AY/fxX6ukqeURvy27MKC39SPVCqEfyPvQzfH63PjePmECkezzGTUYELG9zKNCxkdzOB 3aoTdUSC9sq6l0rfck1rTsl4p18kOpRyqBBh2+tjmb9FhFEpF9WzUa4ANGNqVWn6Hin2MeXGiei e8ucyZcodITTCoSASPMiOylleusagUSujFgQBX17Wphh1Y8GCq0DD4aAtc3najJfWhEwwRKdE0T 1yofyMJDUPVmZT1ouCY4epafrgP5vaHltWWVhs4TQYtKxX8Z1CrjzF7u3LijR6flDVBh0JWbpED CSGeesMPO2J2Kn7AZRqSSROOXQovIzjEaK1RkA7XTNIxo10fP6o4R1ZpYKTwZupCap09y+Gqz6/ z1FFlorYmab3g1dbA/isHsMG5ZNwRrPNWjT3PMF9RfVYoc1AOYljNFkFzLdZ+zsBNR6A6c8NlA5 XflwqEK6SRJQzGDiB6QbKOpdrzVT3Dk6GqUt8S9a62rnj9F92tQbDpBur6CR/0WSx9iUfPYWP2+ lQ= X-Google-Smtp-Source: AGHT+IEpuFdNxVm32Uuv18a5IWYh2q1CtGDKWBV4FlyYhV34uV/yU00dkbpa/nKaoSOO/Mkiao0iqQ== X-Received: by 2002:a17:90b:3fc7:b0:341:a9e7:e5f9 with SMTP id 98e67ed59e1d1-34a727161b6mr543228a91.0.1765328073020; Tue, 09 Dec 2025 16:54:33 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Dec 2025 16:54:32 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Milan Zamazal Subject: [PATCH v7 06/26] libcamera: shaders: Extend debayer shaders to apply CCM gains Date: Wed, 10 Dec 2025 00:53:34 +0000 Message-ID: <20251210005354.44726-7-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" Extend Bayer shaders to support application of a passed CCM table. Reviewed-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue --- src/libcamera/shaders/bayer_1x_packed.frag | 45 +++++++++++++++++++ src/libcamera/shaders/bayer_unpacked.frag | 51 +++++++++++++++++++++- 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/src/libcamera/shaders/bayer_1x_packed.frag b/src/libcamera/shaders/bayer_1x_packed.frag index 19b13ad08..171a928c2 100644 --- a/src/libcamera/shaders/bayer_1x_packed.frag +++ b/src/libcamera/shaders/bayer_1x_packed.frag @@ -65,6 +65,7 @@ uniform vec2 tex_step; uniform vec2 tex_bayer_first_red; uniform sampler2D tex_y; +uniform mat3 ccm; void main(void) { @@ -212,5 +213,49 @@ void main(void) vec3(patterns.y, C, patterns.x) : vec3(patterns.wz, C)); + /* + * CCM is a 3x3 in the format + * + * +--------------+----------------+---------------+ + * | RedRedGain | RedGreenGain | RedBlueGain | + * +--------------+----------------+---------------+ + * | GreenRedGain | GreenGreenGain | GreenBlueGain | + * +--------------+----------------+---------------+ + * | BlueRedGain | BlueGreenGain | BlueBlueGain | + * +--------------+----------------+---------------+ + * + * Rout = RedRedGain * Rin + RedGreenGain * Gin + RedBlueGain * Bin + * Gout = GreenRedGain * Rin + GreenGreenGain * Gin + GreenBlueGain * Bin + * Bout = BlueRedGain * Rin + BlueGreenGain * Gin + BlueBlueGain * Bin + * + * We upload to the GPU without transposition glUniformMatrix3f(.., .., GL_FALSE, ccm); + * + * CPU + * float ccm [] = { + * RedRedGain, RedGreenGain, RedBlueGain, + * GreenRedGain, GreenGreenGain, GreenBlueGain, + * BlueRedGain, BlueGreenGain, BlueBlueGain, + * }; + * + * GPU + * ccm = { + * RedRedGain, GreenRedGain, BlueRedGain, + * RedGreenGain, GreenGreenGain, BlueGreenGain, + * RedBlueGain, GreenBlueGain, BlueBlueGain, + * } + * + * However the indexing for the mat data-type is column major hence + * ccm[0][0] = RedRedGain, ccm[0][1] = RedGreenGain, ccm[0][2] = RedBlueGain + * + */ + float rin, gin, bin; + rin = rgb.r; + gin = rgb.g; + bin = rgb.b; + + rgb.r = (rin * ccm[0][0]) + (gin * ccm[0][1]) + (bin * ccm[0][2]); + 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]); + gl_FragColor = vec4(rgb, 1.0); } diff --git a/src/libcamera/shaders/bayer_unpacked.frag b/src/libcamera/shaders/bayer_unpacked.frag index aa7a1b004..c41d72f4f 100644 --- a/src/libcamera/shaders/bayer_unpacked.frag +++ b/src/libcamera/shaders/bayer_unpacked.frag @@ -24,8 +24,11 @@ uniform sampler2D tex_y; varying vec4 center; varying vec4 yCoord; varying vec4 xCoord; +uniform mat3 ccm; void main(void) { + vec3 rgb; + #define fetch(x, y) texture2D(tex_y, vec2(x, y)).r float C = texture2D(tex_y, center.xy).r; // ( 0, 0) @@ -97,11 +100,57 @@ void main(void) { PATTERN.xw += kB.xw * B; PATTERN.xz += kF.xz * F; - gl_FragColor.rgb = (alternate.y == 0.0) ? + rgb = (alternate.y == 0.0) ? ((alternate.x == 0.0) ? vec3(C, PATTERN.xy) : vec3(PATTERN.z, C, PATTERN.w)) : ((alternate.x == 0.0) ? vec3(PATTERN.w, C, PATTERN.z) : vec3(PATTERN.yx, C)); + + /* + * CCM is a 3x3 in the format + * + * +--------------+----------------+---------------+ + * | RedRedGain | RedGreenGain | RedBlueGain | + * +--------------+----------------+---------------+ + * | GreenRedGain | GreenGreenGain | GreenBlueGain | + * +--------------+----------------+---------------+ + * | BlueRedGain | BlueGreenGain | BlueBlueGain | + * +--------------+----------------+---------------+ + * + * Rout = RedRedGain * Rin + RedGreenGain * Gin + RedBlueGain * Bin + * Gout = GreenRedGain * Rin + GreenGreenGain * Gin + GreenBlueGain * Bin + * Bout = BlueRedGain * Rin + BlueGreenGain * Gin + BlueBlueGain * Bin + * + * We upload to the GPU without transposition glUniformMatrix3f(.., .., GL_FALSE, ccm); + * + * CPU + * float ccm [] = { + * RedRedGain, RedGreenGain, RedBlueGain, + * GreenRedGain, GreenGreenGain, GreenBlueGain, + * BlueRedGain, BlueGreenGain, BlueBlueGain, + * }; + * + * GPU + * ccm = { + * RedRedGain, GreenRedGain, BlueRedGain, + * RedGreenGain, GreenGreenGain, BlueGreenGain, + * RedBlueGain, GreenBlueGain, BlueBlueGain, + * } + * + * However the indexing for the mat data-type is column major hence + * ccm[0][0] = RedRedGain, ccm[0][1] = RedGreenGain, ccm[0][2] = RedBlueGain + * + */ + float rin, gin, bin; + rin = rgb.r; + gin = rgb.g; + bin = rgb.b; + + rgb.r = (rin * ccm[0][0]) + (gin * ccm[0][1]) + (bin * ccm[0][2]); + 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]); + + gl_FragColor.rgb = rgb; }