From patchwork Sun Aug 24 00:48:21 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: 24192 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 5EDB8BEFBE for ; Sun, 24 Aug 2025 00:48:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 03918692E7; Sun, 24 Aug 2025 02:48:56 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mIdSf5PY"; dkim-atps=neutral Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A655E692F7 for ; Sun, 24 Aug 2025 02:48:44 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3c51f015a1cso1518124f8f.1 for ; Sat, 23 Aug 2025 17:48:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755996524; x=1756601324; darn=lists.libcamera.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=YCvAN3AkHvBrZEDLQ+W3FSbEc9RScQY0mqKdSYiufr4=; b=mIdSf5PYlLLLU6JRwRZBi/CuHBa3Sj9kF2ufCyS1VnJs6MhFOPeoQJdqmThoTjz4XV 00O8NptO/JPKH79jU9qRZ0YxZeFhyJNSP+UvzvElrwijRy7ktIfsXrlsbJcvGRKNoTk4 sOtO/5tLvJfAAqzF4v70WIU0FS2PBo0KlWnIu/gDpgUawvoJ32W2FK1Oam+LY4sW9ByR gqMruVN3yLZUR/MGw5Jqx+nj+33NcUQtezcc2r1bptjsQIgcfAy2mJX8usuWA6BkHPX9 piWdpKK72PT6zjrmxLD7Uqxra3WYyaqrGT/E9OgCvk5Sv08b48JzaM1qXX7aDZasj7By ImzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755996524; x=1756601324; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YCvAN3AkHvBrZEDLQ+W3FSbEc9RScQY0mqKdSYiufr4=; b=FwFJK3ucGoCPBM2kPaVemuviYkPnYuh0gLRlqdccX4J1u32xYD+7LVC+dkrU943b7m F+f8RlsimiKWcPeA+raTC/TWBUGww7g/Zzg0Af3IMPTs61WCRdMrxTtGyOcTu+RafEI/ KA5aQk7r/iezCyN0Kf1g4E/0EZqaDvhydd/7gtqMndSBBMWCj7muwE08src+PyMSFXQN igRQRx9BoEZOKjPzrGq0j/JpdBnGU3wxLfsl80C1pjsD5e6H1cWMiQ2ePxEz/elX8xCM GJOitCE1B1g3ajuRKLV03qA6yzdRB5900fBCDzDLLR1aQ6Ws5OTvFXz449fN9dOr8M+U 9Fxg== X-Gm-Message-State: AOJu0YxHqUhrAe9G7asw1ke2CwmYy1xlQSBYsbDfKVsnLJxl2DRhxv8C 975CIcTzT4etmfzZ8DDLVpOhjtGTH4srTshM2cRqOYurAP6MCYhHZ8M9SBUGaRBNn4eqrdq71oa XA3hTIe4= X-Gm-Gg: ASbGnctJVGsDIAxeJ8KOj6PYesYDaNnHJkY8CfhCb9LQ8oKVqcNTG0/xQGKbeVFRBzP p74TVLfAMEDM8izvEHso1rpHzLSq4qC/zc7BAmXs7MW6GhTCs/ymfsN7ROl5LNqBA79t/+geGvP Se+3kJlr4lUZHzVocBt4RovcWKvKzJ/TVsERcdM8FjV9BLBa5PSg5XP85cJOzWvMKCca75k3pfk abyT7qSMmC6muU/1gmIpT3k9IWC920ZvzEWgIe8WIUr7E5pYuhB4+KLs6a7W0ygBMXekEqkyPD8 ebInGTDNGiIY496lqAgxxx4xb42vLykQMllZkZXKecNih1968kiTbYdJJ+0LNnDUYtvMqXu3Pyr ah9gQPmyoKiZFlKXjjpcwJ/R5bo42LDIbI4rmSRnTBw1hZmvq2fiJG0RitMLPgMEIWk01NCPeeM 43nYjSoCZxim1C0ZiXm0Ph X-Google-Smtp-Source: AGHT+IESa23UAxq9VCu+jvTGqSlESjTR7NMbN0WDJEfInZOuXDm31O4UG7BSWG9OP9aECnh3UXMPYg== X-Received: by 2002:a05:6000:1788:b0:3c3:5406:12ad with SMTP id ffacd0b85a97d-3c5dcff73c7mr5206682f8f.61.1755996524146; Sat, 23 Aug 2025 17:48:44 -0700 (PDT) Received: from [192.168.0.13] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4e1d530esm69347225e9.0.2025.08.23.17.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 17:48:43 -0700 (PDT) From: Bryan O'Donoghue Date: Sun, 24 Aug 2025 01:48:21 +0100 Subject: [PATCH v2 09/37] libcamera: software_isp: Move param select code to Debayer base class MIME-Version: 1.0 Message-Id: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-9-96f4576c814e@linaro.org> References: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> In-Reply-To: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3263; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=4PFBU4wyuVCiot0OIoWB+yVFv1FF9Up5n3zwiCDX61s=; b=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFdqFqkgWXzExU1MZG2X5WcIPy/YsIohsoEQ l0oHi/frKiJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphXQAKCRAicTuzoY3I OnloD/9kj1Cl+/4xDAEWoyWz65qgDHDdxhdFIs2ZjzwaHcTAI02Ts4qWFXUZkdJzyzAlrSHM6X5 1TLPEyVnz5hfJpnmd2fjPzXoiN/7qLnPg6PpvsXAy25NZLQdxieXhNrDuPLHkKI4m2U7wC0s7YH 659xAzPSmvILmA05sEmNv0qInm3fH33xbH8jiXTWB9F0iIc+RSOb1h0+0R8n9UvhZgTJnIEpYsn NTFFgnTugEs41vpWfolw7hpjAM1aJnKNFziV12p1R8B78xc2INgtpc43dx4TtrjHWD2Hiifqfw/ 50VxYzM1m0Ji0QgdaqBisCFzLsPSG0hquKwD77Rli8EBK0861Lk1C8Z3YDFUaa2TNVetgiJeuiU hXiGsdznHoZDCRsbLKVbRImHOJpQcpassuzsc5FXrmcBjIdaCCu0+5W3bh4J9UHLXIglZ2nTW+8 mUhFstZbLd04oIfGrYUjoc/KUiHqD9rBAIAHaxxD+qySOcmgfmvUZE5S3SY/rZz7INDvINQOZ1k eqSgV3DvpdD+/sN7sWuwIop2By7VtCkrYhhKUpELyRd1ejnqzVjfV0qhcul/whZoxhxP4dr30V5 4ZAkmby04dcU5jhO1tlEY7tNX217xhduf2Li6F4PpYmQEmsFTIZEj/J4oWseYyHs6wjEs9Oi3I/ bgKiNofFg3RaNmQ== X-Developer-Key: i=bryan.odonoghue@linaro.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A 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 parameter selection code into the Debayer base class in-order to facilitate reuse of the lookup tables in the eGL shaders. Signed-off-by: Bryan O'Donoghue --- src/libcamera/software_isp/debayer.cpp | 27 +++++++++++++++++++++++++++ src/libcamera/software_isp/debayer.h | 3 +++ src/libcamera/software_isp/debayer_cpu.cpp | 19 +------------------ 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp index 29fdcbbfd4eba4a23c520b22784bf003f22a93f4..fc2438c0d0161a36da2769d95836f282836b143d 100644 --- a/src/libcamera/software_isp/debayer.cpp +++ b/src/libcamera/software_isp/debayer.cpp @@ -187,4 +187,31 @@ Debayer::~Debayer() * \brief Signals when the output buffer is ready */ +/** + * \fn void Debayer::setParams(DebayerParams ¶ms) + * \brief Select the bayer params to use for the next frame debayer + * \param[in] params The parameters to be used in debayering + */ +void Debayer::setParams(DebayerParams ¶ms) +{ + green_ = params.green; + greenCcm_ = params.greenCcm; + if (swapRedBlueGains_) { + red_ = params.blue; + blue_ = params.red; + redCcm_ = params.blueCcm; + blueCcm_ = params.redCcm; + for (unsigned int i = 0; i < 256; i++) { + std::swap(redCcm_[i].r, redCcm_[i].b); + std::swap(blueCcm_[i].r, blueCcm_[i].b); + } + } else { + red_ = params.red; + blue_ = params.blue; + redCcm_ = params.redCcm; + blueCcm_ = params.blueCcm; + } + gammaLut_ = params.gammaLut; +} + } /* namespace libcamera */ diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h index 01b6e916f2a7199c592abd8a57ef549eaf388a8b..5f692bcbdeec1447c596ebbdc984585948a34880 100644 --- a/src/libcamera/software_isp/debayer.h +++ b/src/libcamera/software_isp/debayer.h @@ -82,6 +82,9 @@ public: private: virtual Size patternSize(PixelFormat inputFormat) = 0; + +protected: + void setParams(DebayerParams ¶ms); }; } /* namespace libcamera */ diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index 408ce2baa5e8a23902cbf0ca2b9ea87e73b4e882..6ed17e9fc144bc7c3472d999b1e9c23236020963 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -746,24 +746,7 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output for (const FrameBuffer::Plane &plane : output->planes()) dmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Write); - green_ = params.green; - greenCcm_ = params.greenCcm; - if (swapRedBlueGains_) { - red_ = params.blue; - blue_ = params.red; - redCcm_ = params.blueCcm; - blueCcm_ = params.redCcm; - for (unsigned int i = 0; i < 256; i++) { - std::swap(redCcm_[i].r, redCcm_[i].b); - std::swap(blueCcm_[i].r, blueCcm_[i].b); - } - } else { - red_ = params.red; - blue_ = params.blue; - redCcm_ = params.redCcm; - blueCcm_ = params.blueCcm; - } - gammaLut_ = params.gammaLut; + setParams(params); /* Copy metadata from the input buffer */ FrameMetadata &metadata = output->_d()->metadata();