From patchwork Thu Dec 11 23:22:35 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: 25504 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 8A818C3257 for ; Thu, 11 Dec 2025 23:23:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4F86161657; Fri, 12 Dec 2025 00:23:50 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="DuCYtJuk"; dkim-atps=neutral Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 24EDB61643 for ; Fri, 12 Dec 2025 00:23:48 +0100 (CET) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-7b89c1ce9easo757377b3a.2 for ; Thu, 11 Dec 2025 15:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765495426; x=1766100226; 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=DuCYtJukqfMFLd5Ed2zcN2VEbokvbcgQQN6xotBIU1nVAScVrdwMkJ2JSkt2Y/tQ1I 5GfKtuQNS0j4iHBemntA6h3Z4zaW+k84o40FfwrnVoYFA3Mrl5S913J7hmltT42dm1wU sm7H55GoTJPYdNXNGQRNQanSKd7OUxWSAPGIFg9dShtqHP1mGWNBezs0xT0zgUC7SpQn VUrf9pjzAaLgJvsu+2Lc4h9SvISL2LCKmHz1VMV0nE3BgW5gBZDlT+Z/4cFkxsBJ3XG5 K9hBmY7FVDxGQlM3P6As3L7lCOkR1rBIXOYteeuQfvTfL+0rOh4+0xMjXINL+SAN2rDl NEqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765495426; x=1766100226; 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=X6NhUrNrGbQt6I5jLPVB2aiJHOlXAvIrYbnZKIo6O9CzOBSD4Swzegl4TwGIirPYAZ qBdQK2Sp0UYj0Oh0QWuzfhne52/E7qw0ESyIvWdEtsJwmOcv9OsxUgIghVcmn1XB02re ZI4KaAZI3qVtrKdB3CaoxB6jp7sr1/lfzSYfAv7eL4YKFCOvBxLhBcOB5pRwX9m5ZudG vbPKrDlhLBHc+OauybSwDDMzNu9GHunv8cFVCOxCtPATATM2og5NfJQmMxh0GUvxv8O9 JCiDj1xReFgWmakKhIVIFlPn4pCfCIjYhE2ycI4F4Ueq0ISaRQVzScJ7IeIerunE8e3+ 6/TA== X-Gm-Message-State: AOJu0YyvP/5jDHdHm6NenVMI05HE5erCBHBDiRjOxkMbEg84EYkcviuM ETjfHVrzEz+nntVhVFDiBHy9KHJ+Vru2Yp0pjUZcRZcOXXksJc+o8YeaAzVp/zI2uPsSh/6ENJl CynuM X-Gm-Gg: AY/fxX4XUznrwB4EdPeFwPCgjEvH/mmuC/ZA2k4lovl4YOHapmK8UE+amLopI15t/DZ qri+rcqwUZRKoGmwlqb3YDE1R3jPCOFsU7OS6MBPgxVoC0Z6P7BFubC29xi39SoOeTw9WG3CKTT wy2ea9L4bh/vJk9sIE9SAtXPC/r59o+Pi88V+IeZla1aQi50IQfAIqKI+7CSL7kdIb0qhia8z5Q oV+XHEzkV/LR4ahfC0Gs9EWcisKXnGiLBUbFDdfnInI+h+svPMMgZPwCjCT0/M2tEvTfQ0f32PV 1YEjsuCw3PxfLkKkslpHHtpN4X8kOEin35j434Y8UZ4tsp6UHyQIXD9UO5BqJx5DIbkuo93yS9V by/dsDAjV9o53tienBJvpA6CjCoIv552XHXueLr9ggwDXb/KcIYInJ+V/D8KQhvLRpOyXZzfTmt FJ3rvnkd1Y6Ryia/wwTiT2ZAvwY1r88A5PmJwjT1bplkBUzoDHZ24/yZU/aSfc3Q== X-Google-Smtp-Source: AGHT+IH1C7OmG0P59HYn7vAi4jppeVQSDclMjaJ/6VXFcIK/IEHidBzZUeelguZe4U9Fqd5Zq6i71w== X-Received: by 2002:a05:6a00:8c11:b0:7e1:b7ba:d5a2 with SMTP id d2e1a72fcca58-7f664c09e44mr224853b3a.0.1765495426422; Thu, 11 Dec 2025 15:23:46 -0800 (PST) Received: from inspiron14p-linux (M106185144161.v4.enabler.ne.jp. [106.185.144.161]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7f4c4ab52aasm3399933b3a.38.2025.12.11.15.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Dec 2025 15:23:46 -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 v5 10/20] libcamera: software_isp: Move Bayer params init from DebayerCpu to Debayer Date: Thu, 11 Dec 2025 23:22:35 +0000 Message-ID: <20251211232246.31330-11-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251211232246.31330-1-bryan.odonoghue@linaro.org> References: <20251211232246.31330-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;