From patchwork Tue Apr 22 21:59:20 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: 23240 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 820BDC331E for ; Tue, 22 Apr 2025 22:00:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 09F0568B54; Wed, 23 Apr 2025 00:00:18 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Q4238P8T"; dkim-atps=neutral Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 644F668B49 for ; Tue, 22 Apr 2025 23:59:49 +0200 (CEST) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-39c14016868so5711679f8f.1 for ; Tue, 22 Apr 2025 14:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745359189; x=1745963989; 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=wmRwDLedsnMO6yr9mFqNtiEcjM/t9yyved9O22mAiPA=; b=Q4238P8TMxnfadUIOweUFGr14ijCjBr6yXWfZyi9ZhJ4RfQpnT+Ke745Lv344PkoS8 Iqn6O/xxUDiO8WLwhU6ntiBL3UsEUQpPLuus/+uodURchTCZBKC2wcERu+DQ9AL9qxW3 89jNS5ssuYE09ANzHxhzO2UpjksJqMzEW+VW5b5F8MlVqrwc8zIXUmkbKd0NKr9MSeKh XFzenQIpZMUk/FvQKiaaNKa7NpW4b2mn1z5s/I8ryc7JFGw05jdt0zyV9dAprV6oFvTu 2pvRwwJHaAlJxO2kecCTin3X6a2A7dl0tWRPvO5ObgEzIEGmGWDdspeIeCMYrLylJA9r eyhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745359189; x=1745963989; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wmRwDLedsnMO6yr9mFqNtiEcjM/t9yyved9O22mAiPA=; b=osINqGDxUx2UHP+QkpWoBcV+ehN6VL0mT708dlaLCyMVXfT8IklfOe0aeUWgCsh2cU xRexF16rrapIqi6H3fn/QcWVbwYdOW8Q8HlgImG75ExLqaqhSMg2julJSqVVqoHMnIKt 8afWq3tfOM53DPVGRlGEBXq6+88YE7MZKnw5CFpDQpZ4oQRqQghjsNK7iOVHnvvg2PgS oXh6+v04R4c7UJBnwC/oxYgNt0riL34k+JMVv26YwExVNjUqlyLtySWR00NGrM7VgPVi +vcXY/lmSS+Jx0bbjmsSsq9e2SOgTNR7iiQMIVnIcNr3uFZDCojM8x+mNi4m0jlz+ypV G+3g== X-Gm-Message-State: AOJu0Yw+dxw+NCoj5pvChqVxKZWNsP/c4XNBcnar5bZM4CqJC9ASqrcV f8lo1KIb8+OhZK6lFEsgcxeotltnnGA8A72bHsn/wZB7p0VMYOGJV2tbYAZhSyaUfYavp+9K/su 935Q= X-Gm-Gg: ASbGncsVOjCO9v3/EaKsZ1o6vCIhvQi7DwyRqDbNf4sLeRAYbBBfcMhTUzunsfigRXb LwFu6MN+tGWsTbgeOdQDDLlJQjexxcjG98X81IW/stBSwBcdOEG/xbnc+ZN9T9lHmtpQ4Z2iRvf A/0pVf7G/pZNesL8oW0C3VykU7Oy9pWzEpV6YxnS9gM2lXFXFTMnX+o/iZXC1k0XbijEWMnA+BG Jnu8zqKpeGQIgZ2t+GGdyvC2dtDPAjy7YvYS7DC2lAAjdFTi6/+BSJ0bKB1Yh3A1rVAq7mvDUEw zD1WUbJGiZxmgPG62seWGR4FAUna80lD+2NXdb9Qa6T0WzF0i1BoYLbNIBPkBoWS81pO8M0blwM cyQTjD86qXGUQtS95FBNdMH0/YvLU7n0= X-Google-Smtp-Source: AGHT+IErHHN8UwkVL/aHJiMvcryGHUWcDvKLh32XQZ2hNYUDCi6fuRiBZZxDJ9pu6EIeo3+hjc4BhA== X-Received: by 2002:a05:6000:40cf:b0:39c:12f2:2f86 with SMTP id ffacd0b85a97d-39efba2ab5amr13237543f8f.8.1745359188758; Tue, 22 Apr 2025 14:59:48 -0700 (PDT) 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-44092d2eccesm2726615e9.20.2025.04.22.14.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 14:59:48 -0700 (PDT) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: hdegoede@redhat.com, mzamazal@redhat.com, bryan.odonoghue@linaro.org, bod.linux@nxsw.ie Subject: [PATCH 27/27] shaders: Extend debayer shaders to apply RGB gain values on output Date: Tue, 22 Apr 2025 22:59:20 +0100 Message-ID: <20250422215920.4297-28-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250422215920.4297-1-bryan.odonoghue@linaro.org> References: <20250422215920.4297-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" Signed-off-by: Bryan O'Donoghue --- .../internal/shaders/bayer_1x_packed.frag | 10 ++++++++++ include/libcamera/internal/shaders/bayer_8.frag | 16 +++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/include/libcamera/internal/shaders/bayer_1x_packed.frag b/include/libcamera/internal/shaders/bayer_1x_packed.frag index 19b13ad0..9a2389f7 100644 --- a/include/libcamera/internal/shaders/bayer_1x_packed.frag +++ b/include/libcamera/internal/shaders/bayer_1x_packed.frag @@ -65,6 +65,9 @@ uniform vec2 tex_step; uniform vec2 tex_bayer_first_red; uniform sampler2D tex_y; +uniform sampler2D red_param; +uniform sampler2D green_param; +uniform sampler2D blue_param; void main(void) { @@ -212,5 +215,12 @@ void main(void) vec3(patterns.y, C, patterns.x) : vec3(patterns.wz, C)); +#if defined(APPLY_BAYER_PARAMETERS) + /* Apply bayer params */ + rgb.r = texture2D(red_param, vec2(rgb.r, 0.5)).r; + rgb.g = texture2D(red_param, vec2(rgb.g, 0.5)).g; + rgb.b = texture2D(red_param, vec2(rgb.b, 0.5)).b; +#endif + gl_FragColor = vec4(rgb, 1.0); } diff --git a/include/libcamera/internal/shaders/bayer_8.frag b/include/libcamera/internal/shaders/bayer_8.frag index aa7a1b00..a7ed75c8 100644 --- a/include/libcamera/internal/shaders/bayer_8.frag +++ b/include/libcamera/internal/shaders/bayer_8.frag @@ -21,11 +21,16 @@ precision highp float; /** Monochrome RGBA or GL_LUMINANCE Bayer encoded texture.*/ uniform sampler2D tex_y; +uniform sampler2D red_param; +uniform sampler2D green_param; +uniform sampler2D blue_param; varying vec4 center; varying vec4 yCoord; varying vec4 xCoord; 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 +102,20 @@ 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)); + +#if defined(APPLY_BAYER_PARAMETERS) + /* Apply bayer params */ + rgb.r = texture2D(red_param, vec2(rgb.r, 0.5)).r; + rgb.g = texture2D(red_param, vec2(rgb.g, 0.5)).g; + rgb.b = texture2D(red_param, vec2(rgb.b, 0.5)).b; +#endif + + gl_FragColor.rgb = rgb; }