From patchwork Wed Dec 10 00:31:27 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: 25406 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 92226BD1F1 for ; Wed, 10 Dec 2025 00:32:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3A82461440; Wed, 10 Dec 2025 01:32:27 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="i8WWyzvv"; dkim-atps=neutral Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8961361440 for ; Wed, 10 Dec 2025 01:32:24 +0100 (CET) Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-34a4078f669so1884839a91.1 for ; Tue, 09 Dec 2025 16:32:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765326743; x=1765931543; 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=KQPTsn/KLpLpdnxwrT8L2zFzJbbxCaiz8WDvZQ7olVM=; b=i8WWyzvvopEgmPr21fKyyJ5jkEirQbW5u2FLYibu60XJ4OXhsXdpl+CkFcx0K0CvWi sa90f7aLnuG46tcURQyuw8ZEMZwgc7clH+W4iMt1zse0Vo9v3Tl3Pq3m8XnEK4jEZK1m zefJuCfS72BrCKbbs3WH8X5xZFvo40csENNtexFDQWWsfHgjuh3yKD6hfEtIAdlblzGQ nc/ciwTC6Gp5pPUmYkOLO3E7agD4NSKJXHHuvF5RStHtBOuY7wGXPYo4Fab/EG8Ba8jE epqNL9UgxM9yskkv+e6SpxjM77Ot0PBHldFTQuIAwDPY8Bt8VZsNrsdl8GFHoHk1DRey WBNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765326743; x=1765931543; 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=KQPTsn/KLpLpdnxwrT8L2zFzJbbxCaiz8WDvZQ7olVM=; b=Q9Slq77U9dY10w/BD+oeB0qo8VncvaUY9uiPBQyz/orhhr7b1+hvpcq9OlOL++v76f hNMYEddkJfGD4GIGs3F8770GEnd/7tXAPCaNlWrRi9JOyPceC6oBcXerlcIrMTs+/t08 qWFLQ7QZ1YMu3fzeqT8T377/KmWItEI/bLBf27MGWrRi2xNcYVRn6LNFIXQFaS8ywzto ajV3RzSSDj3hJ4a0bnnlqoDWp/YizKz3OrIPX3DF2ekeLyt1vIpsX0xHyrEuVX7ubF3f dlYjLg+NntavjynBmIgNnOva9TzPH/OJ0RI06vRMVHeoAxIfL7YSDqZLQjD7DPGtggkv ZwlQ== X-Gm-Message-State: AOJu0YxYeqlSR4K7O1LQMTbXpXdMndtRDCIlSOjreQem0OOBMy4kx6/i l/brqK/saQEOB67pbktQrtU9M0wEZ0rpegnn4S8tL8ODUGp4ToAhnlKdKN+gMiU4j5yg4XqG//a t3CmW X-Gm-Gg: AY/fxX5d+DeUn5Xyj9MpiA1ZSpADihFXGdfQdMVemR1g0+GLS5PkDtbbcuhwrwgEQfU HnO7FTbWUbxhcjmaHJK3ff8l3lGxM6ebBGcpJDhuNtwxeSXQijFPqNCEP+7XWs6y6S2ngCreGm8 AXS+lUc7YOzUesh5HSkRY/t3Cx4bjrMLPe0/FXTwmp/ZxY5rtB4atGP5pxv+EMtaHLC+OEWrUOt xLladF2I+0ICylgQIKpF4VK40COjOh5Qn+W6ptBpaVacH+u+/YrCikKxmJz/+MT0Q6pdw7Nx41n sKei53Cl1rwrY4xXN/i5ASHF1TJg0Zduf6p6uj+uqMCxf6URo/C/SR2p+rZbn7TwJtzUrSlQyMj Bnd5mXwFjlH+mVCknb2UJQ5pY+XpdJgoQDYDtpBVxRtfiT/MJeX1BNrpBlb0gAdDUA/x1o4G6Xe yUBm3kGlz+D1Ov9iCa/B0HYcChvnMO6UevpiF7VUPamlQSW66ygvDI8v4usPiPVNZBdnejx52a+ ps= X-Google-Smtp-Source: AGHT+IFVa4xUbYp1E2+SS8o4xvaEu3X8wDTAtQMN4cpw6Z8awnzTFunJQvgS4EULItKO0tbiWFkL+w== X-Received: by 2002:a17:90b:1d02:b0:343:6108:1706 with SMTP id 98e67ed59e1d1-34a728c6d92mr511419a91.17.1765326742745; Tue, 09 Dec 2025 16:32:22 -0800 (PST) Received: from inspiron14p-linux (p96936b06.osaknt01.ap.so-net.ne.jp. [150.147.107.6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34a70427ea6sm566580a91.3.2025.12.09.16.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Dec 2025 16:32:22 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Kieran Bingham , Milan Zamazal Subject: [PATCH v4 10/20] libcamera: software_isp: Move Bayer params init from DebayerCpu to Debayer Date: Wed, 10 Dec 2025 00:31:27 +0000 Message-ID: <20251210003139.43606-11-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251210003139.43606-1-bryan.odonoghue@linaro.org> References: <20251210003139.43606-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" Move the initialisation of Bayer params and CCM to a new constructor in the Debayer class. Ensure we call the base class constructor from DebayerCpu's constructor in the expected constructor order Debayer then DebayerCpu. Reviewed-by: Kieran Bingham Reviewed-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue --- src/libcamera/software_isp/debayer.cpp | 11 +++++++++++ src/libcamera/software_isp/debayer.h | 2 +- src/libcamera/software_isp/debayer_cpu.cpp | 8 -------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp index 1e3f08673..8cadfaadc 100644 --- a/src/libcamera/software_isp/debayer.cpp +++ b/src/libcamera/software_isp/debayer.cpp @@ -109,6 +109,17 @@ namespace libcamera { LOG_DEFINE_CATEGORY(Debayer) +Debayer::Debayer(const GlobalConfiguration &configuration) : bench_(configuration) +{ + /* Initialize color lookup tables */ + for (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) { + red_[i] = green_[i] = blue_[i] = i; + redCcm_[i] = { static_cast(i), 0, 0 }; + greenCcm_[i] = { 0, static_cast(i), 0 }; + blueCcm_[i] = { 0, 0, static_cast(i) }; + } +} + Debayer::~Debayer() { } diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h index b562985a6..f4373ddeb 100644 --- a/src/libcamera/software_isp/debayer.h +++ b/src/libcamera/software_isp/debayer.h @@ -33,7 +33,7 @@ LOG_DECLARE_CATEGORY(Debayer) class Debayer : public Object { public: - Debayer (const GlobalConfiguration &configuration) : bench_(configuration) {}; + Debayer (const GlobalConfiguration &configuration); virtual ~Debayer() = 0; virtual int configure(const StreamConfiguration &inputCfg, diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index e55599f09..8f42d706b 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -57,14 +57,6 @@ DebayerCpu::DebayerCpu(std::unique_ptr stats, const GlobalConfigurat */ enableInputMemcpy_ = configuration.option({ "software_isp", "copy_input_buffer" }).value_or(true); - - /* Initialize color lookup tables */ - for (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) { - red_[i] = green_[i] = blue_[i] = i; - redCcm_[i] = { static_cast(i), 0, 0 }; - greenCcm_[i] = { 0, static_cast(i), 0 }; - blueCcm_[i] = { 0, 0, static_cast(i) }; - } } DebayerCpu::~DebayerCpu() = default;