Message ID | 20250611013245.133785-28-bryan.odonoghue@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <libcamera-devel-bounces@lists.libcamera.org> 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 24D16BDE6B for <parsemail@patchwork.libcamera.org>; Wed, 11 Jun 2025 01:34:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9395968DF4; Wed, 11 Jun 2025 03:34:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="VegyqQd4"; 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 33F9768DBD for <libcamera-devel@lists.libcamera.org>; Wed, 11 Jun 2025 03:34:16 +0200 (CEST) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-450cb2ddd46so36245245e9.2 for <libcamera-devel@lists.libcamera.org>; Tue, 10 Jun 2025 18:34:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1749605655; x=1750210455; 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=Y+rhqXuB1F9aT3Pl3A23g+gsKVe9C5G7edD32dZ1KTo=; b=VegyqQd4MAZpSIt+CFVsIHEfxr1IfvBaOleCgG76DbDWQJF2nXJT5P8jdwQkSYhYaA 2Kk+mmu3jCio9lcGSgltWXKD6wF+/ShX1ClqtXI1fy2Pj7Rf+R095v5QR3MNSKTRf2sB LtmFcSRCrPKphZgXYBIx8poE1/Yd0H078vhNRIv2n3gMZfzcvL3+4jJyH6i/ychezjEL FsGG0dF2WSjMLbNY/i41yMIMYOpKsIkMtpSVBzLw5RoYv9ATCmYzY1iJo9TY0869E9zf iqlu0D7vGCSWu+v5/0llKqt6ffhbOMXcpLsWvt8Q+k6zJz/n6XUFMRuZGDXV9xqpol+8 iZiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749605655; x=1750210455; 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=Y+rhqXuB1F9aT3Pl3A23g+gsKVe9C5G7edD32dZ1KTo=; b=qktWHcMeJ2aQyN5bD68PU8lPeYQQP109MXkUYzDMOV26t0bT86NDsCFw09qi1egSJB 4qdX/+okjucMoIDq6oQIdgjAEQxlmplbk0GDZvUGUjONiGLTZ04h+6dxvKauo19xQ8xw EK8r1al16hfnandKTvCwcyoTRxFqObIz3FkP9LleAAEBqDw5z4ZktFd+X+FqeYGvZtgY E9ScN0KGEQyK19Cg+hEO8Iwb+8DHMhnNMBmEpEgLzrJjzCgQRepU6SbCjzUUTcPK8pEb Dqk1bPgxVz+90okyO4H3DtcGvyk1GpY5tuC+hSGL3AOqw8RkT/ZcpZ2nk6v6CmpDdlSV iERQ== X-Gm-Message-State: AOJu0Yx9ITe09AP4HH/dRmot67sstYXy7r9mlBYUb4DNqJ+RhqIFFab4 fnt+UbBCMPd8sCmXl/BInwcNT1XKkjbzQfH8HLapJyDU/0EfKaGffQRQNh2X4xnEnsIpbI8vbDM K1R5MPiE= X-Gm-Gg: ASbGnctPqZ8Diw1YLf/poBXn+c6fVtpZjBALK9T5ccZS/nvroyf8UgucHvJMWGe7TWb p4h07Lt7pLnfS7de2UQYplKwJe7eBSg1yHIru9RHnpWsu5ax+NCdHvDI7vUWCm9tEwRCwycaUyb jAVNnBzALMtkkU3WbJ1bV2tBsi8j5MjMEd18BAjcD6+xlFPvfHMfg4D8uwhwn+8+dGPJQaqoDzy QhBLfQXTvdhBsBCojrXboS201pi1tNVECXRdt+Mj4KtvOC7wB9ydmuYzYCNxuFS5s9QrIOH+a8/ qefUJ1vWDvVZVKic7T3m1XvD2FSggvZuGuyf0YBiux9PTlMCHhJgDHAlhJdvivlfHITa9/6HiaP mnlZI8kEscy4XdJX8HEN3MEqxHRXx8D2DVNs0WcLBhg== X-Google-Smtp-Source: AGHT+IFltwPxkkKbGEd3eZMG1+KWhnD+YsKhPkr40/sW/fULcqx4Z/8yWVH3E4tdgsj2riTkTP/XLg== X-Received: by 2002:a05:6000:2087:b0:3a5:52cc:346e with SMTP id ffacd0b85a97d-3a55868917fmr783441f8f.6.1749605655527; Tue, 10 Jun 2025 18:34:15 -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-4532514138asm5680625e9.3.2025.06.10.18.34.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 18:34:15 -0700 (PDT) From: Bryan O'Donoghue <bryan.odonoghue@linaro.org> To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Subject: [PATCH 27/35] libcamera: software_isp: debayer_egl: Convert from identity CCM to CCM calculated by SoftIPA Date: Wed, 11 Jun 2025 02:32:37 +0100 Message-ID: <20250611013245.133785-28-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250611013245.133785-1-bryan.odonoghue@linaro.org> References: <20250611013245.133785-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: <libcamera-devel.lists.libcamera.org> List-Unsubscribe: <https://lists.libcamera.org/options/libcamera-devel>, <mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe> List-Archive: <https://lists.libcamera.org/pipermail/libcamera-devel/> List-Post: <mailto:libcamera-devel@lists.libcamera.org> List-Help: <mailto:libcamera-devel-request@lists.libcamera.org?subject=help> List-Subscribe: <https://lists.libcamera.org/listinfo/libcamera-devel>, <mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe> Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" <libcamera-devel-bounces@lists.libcamera.org> |
Series |
|
Related |
show
|
diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 824cd6d3..b30d2107 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -293,7 +293,7 @@ int DebayerEGL::configure(const StreamConfiguration &inputCfg, inputConfig_.stride = inputCfg.stride; width_ = inputCfg.size.width; height_ = inputCfg.size.height; - ccmEnabled_ = ccmEnabled = true; + ccmEnabled_ = ccmEnabled; if (outputCfgs.size() != 1) { LOG(Debayer, Error) @@ -511,10 +511,10 @@ void DebayerEGL::debayerGPU(MappedFrameBuffer &in, MappedFrameBuffer &out, Debay // Populate bayer parameters if (ccmEnabled_) { - GLfloat ccm[] = { - 1, 0, 0, - 0, 1, 0, - 0, 0, 1, + GLfloat ccm[9] = { + params.ccm[0][0], params.ccm[0][1], params.ccm[0][2], + params.ccm[1][0], params.ccm[1][1], params.ccm[1][2], + params.ccm[2][0], params.ccm[2][1], params.ccm[2][2], }; glUniformMatrix3fv(ccmUniformDataIn_, 1, GL_FALSE, ccm); } else {
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- src/libcamera/software_isp/debayer_egl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)