From patchwork Tue Dec 2 13:31:45 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: 25300 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 53680C32F1 for ; Tue, 2 Dec 2025 13:32:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B3ECE60D26; Tue, 2 Dec 2025 14:32:28 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="uO7bcIgp"; dkim-atps=neutral Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C1EC060D13 for ; Tue, 2 Dec 2025 14:32:17 +0100 (CET) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-42e2b90ad22so1250284f8f.2 for ; Tue, 02 Dec 2025 05:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764682337; x=1765287137; 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=PYxXfqRVTKkcbydoq54khVfP7mMuF5TcbppUiqX56+k=; b=uO7bcIgp6LhHezZ50HU7cC/WByA2ebaS/BsH3uSBcbjeGV0t+IM9S8KenyTfNj9cbK Vq0rqVKiR7D6cUhZ00PcKrlKvWHtHv0YMOXmEPMURtUtrnfjtXiR07HPEG44mo08O3kV j9cRA2Zwc6/XuH73YKBnvnCkINLPHzkKi4vuuIPFPf5N1inhl/KqwP53zAE7AUsZi3LE 4Bus27nENlkqeOhjixVE6872Ac1lc/PqvcWPPWwFk3vqLkKkqK6ZhYVfxjHWIw+FG3Cm 78t0MHjSibwTEc8PU23Dqfz+yr+FlifwBusjz3Gull/5jlP5kqWT8K1H6WrANRwWFl7y b5IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764682337; x=1765287137; 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=PYxXfqRVTKkcbydoq54khVfP7mMuF5TcbppUiqX56+k=; b=jdKH19PDWRPfF/z5iy6Sj25KToioecU1g55peIRZQNSw1eaVisywIIfbhGAjyYdDzJ lohMQBZYw9vA1fK4yYBEcX0/kdgcOsGrJKkCid/sJZIee7JivXQVW6WykAdCIThmJK+n aMVlOmaEzq8E7eBe3xReR1N1Cf3aGsFfOl/mo2uRAkjBuD5pqr+HfK6R53t/0z8tRy/N gFKjdkjCgwiMNWwRlBGM33hUh/HL9bgMJthKGYBQ5QzxZtF6B1DGguyQMlsDndXCzigH qVrVM0nhobUjIidHZRmYmTRj5jrQREWwWsAepVCJUbOy3HUh2/cvY2RjPupWu6qodzhv RPHQ== X-Gm-Message-State: AOJu0YzBQ/a7scRx1g60na2xwLzkFwYcqWTlJ/RxRAgNDKRm67U3Zm4f 3o91N43UBlJSCPIdE6waB2NkgaTblgVmQZVlUTgY37UOZc61iC0kSRNMFj3myvjxIYWlupWUahd /oAtQ X-Gm-Gg: ASbGncudw0SAm7BIiUEsn1OeoShd18KejfTc/tZuX4LwOXDgt1GVusoefiezaB2WS5/ IE241MWT6VikJ+D9gwWZ8ERi4kCtbt1BV1tmSoObEH2W1Ta1hpZ8oPQ7u3EKMEnHxGcYTEc7S82 wPXQ3Sgd6Rlk+I+3Wf23baevgBl+vItIbXSEox4jCBaycMFAZHC6r8Jtcuq1X+mRF0NALeq1CPp qU+N8R6HNFXi348PGue+hpeF4D8HDymUrHL3P9uaYPdOq/7LMopwT8i6+42C3RW1nNtC+9GeUum SjmnF5hOBG7AF9DZzhLY+3bZG7mO9DcLvavmnI1lt6uvuga2XFlmqQCGtWkOE/CFHsaSh++5Krw FWTXYK1XZHPRScZQMNayXRA6DZwUVep4Y4ax5Rc/V3+L2/cgVu+dF5c70mOf1gOH30/oSgGxFHe R/ZyIR4/VaKgRJ1WIzK6yOHzuG3xPp61pv5yv0yCUqIoE4T/PMEjeBPdXmjT89y1lXtCo= X-Google-Smtp-Source: AGHT+IFd1FJe3hoF32cpqoAnMjWpyF0gAjbul2WCqwrm38qMiRA+TWs0k7e/0ZpbrY9sUhrqijelPA== X-Received: by 2002:a5d:5d12:0:b0:42b:3062:c647 with SMTP id ffacd0b85a97d-42cc1ceff02mr46248902f8f.21.1764682337038; Tue, 02 Dec 2025 05:32:17 -0800 (PST) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42e1c5c30c4sm33363322f8f.9.2025.12.02.05.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 05:32:16 -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 v3 14/22] libcamera: software_isp: Move isStandardBayerOrder to base class Date: Tue, 2 Dec 2025 13:31:45 +0000 Message-ID: <20251202133157.661407-15-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251202133157.661407-1-bryan.odonoghue@linaro.org> References: <20251202133157.661407-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" isStandardBayerOrder is useful to both CPU and GPU debayer logic and reusable as-is for both. Move to shared location in base class. Reviewed-by: Kieran Bingham Reviewed-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue --- src/libcamera/software_isp/debayer.cpp | 10 ++++++++++ src/libcamera/software_isp/debayer.h | 2 ++ src/libcamera/software_isp/debayer_cpu.cpp | 6 ------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp index 158128f30..1d135b278 100644 --- a/src/libcamera/software_isp/debayer.cpp +++ b/src/libcamera/software_isp/debayer.cpp @@ -379,4 +379,14 @@ void Debayer::dmaSyncBegin(std::vector &dmaSyncers, FrameBuffer *inpu } } +/** + * \fn void Debayer::isStandardBayerOrder(BayerFormat::Order order) + * \brief Common method to validate standard 2x2 Bayer pattern of 2 Green, 1 Blue, 1 Red pixels. + */ +bool Debayer::isStandardBayerOrder(BayerFormat::Order order) +{ + return order == BayerFormat::BGGR || order == BayerFormat::GBRG || + order == BayerFormat::GRBG || order == BayerFormat::RGGB; +} + } /* namespace libcamera */ diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h index d2893d81b..ff4a92c15 100644 --- a/src/libcamera/software_isp/debayer.h +++ b/src/libcamera/software_isp/debayer.h @@ -20,6 +20,7 @@ #include #include +#include "libcamera/internal/bayer_format.h" #include "libcamera/internal/dma_buf_allocator.h" #include "libcamera/internal/global_configuration.h" #include "libcamera/internal/software_isp/benchmark.h" @@ -88,6 +89,7 @@ private: protected: void setParams(DebayerParams ¶ms); void dmaSyncBegin(std::vector &dmaSyncers, FrameBuffer *input, FrameBuffer *output); + static bool isStandardBayerOrder(BayerFormat::Order order); }; } /* namespace libcamera */ diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index 8f1b4e53d..00738c56b 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -288,12 +288,6 @@ void DebayerCpu::debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]) } } -static bool isStandardBayerOrder(BayerFormat::Order order) -{ - return order == BayerFormat::BGGR || order == BayerFormat::GBRG || - order == BayerFormat::GRBG || order == BayerFormat::RGGB; -} - /* * Setup the Debayer object according to the passed in parameters. * Return 0 on success, a negative errno value on failure