From patchwork Sun Aug 24 00:48:23 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: 24194 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 33DECBEFBE for ; Sun, 24 Aug 2025 00:49:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A452769310; Sun, 24 Aug 2025 02:49:01 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bp64ZIm4"; dkim-atps=neutral Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E2F24692FE for ; Sun, 24 Aug 2025 02:48:46 +0200 (CEST) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3c68ac7e238so724713f8f.1 for ; Sat, 23 Aug 2025 17:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755996526; x=1756601326; 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=BSbX7C6RruZ0Vo2tdf4h+8oPbP0c8nchKXGky/xmrks=; b=bp64ZIm42XrHcuyfY4tE7aeefLmY8+/NGE7Td2Q4XXVf02QVUCGNpXm2ts5h6eOJDW WiPcmml7y4dZbTYtNy9Cdv7BwAY6f+KrmFm4CaebDJcI+LMo7Akq6GsRvMom/YCJD3Dv FAkdD6Wjqb1XAeq9tf41jD7Zrkp+Dw/Mc/JEK8Lh0AW2MrNdV3u9QI2YGO3J9v8bMBpm kbJhmlCS7A+R6kFTahS3sn1aDUlNM/Xzy7QSczeV9iv9Uxn4spApBirdjc+QrAjgT7Ob KyhrCr+KSGWM11wThhOPT3HjtNqcwtLKPu8oJBJ0sn8T5MbXsR+K7BwFaCngPeoAtNwy Htfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755996526; x=1756601326; 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=BSbX7C6RruZ0Vo2tdf4h+8oPbP0c8nchKXGky/xmrks=; b=oyFs1MN9kd9FvxfabHFWSjfTgAHDl1IBFOqZH4HFBS9H9QJgJV0JabINodUX001aeq VAo9+gH778a415rkbw8KZYkZKUFdz+dfmbPr0jrx9yzFGknpkAuZ1XHMNg8yOpcHTv5y eAJ2A4qFmn2X8cY24Cqgi+aUCbEQn4ZjSaRE+m6lQ+U0fr/kCeKpN+06JFbHzv03OIzd WWMy/UOtO9RLBJTmZ1iWPskQSn8v9OCtZHn3g3Q7TJrEgYjql2MhyZrR5caMZCex+0dA Ogo1THUnd6brK479eI2OjMNKicTXCJz037dz6kLh9SKBQeSSuUemA111Tj2QM7fPZt7K JPNw== X-Gm-Message-State: AOJu0YyLMJNAmPsV3bh9gjHVnoh8nhOw72jAGDdqo1oHM7BdaiE6QJkG ynvfKb5SI04rGtYlmTnU4u/w8f8Ut+DVMRDvmL89CQbF5KKkD57n0ffkKL350E+Q4qUqxXGWO5d e24Ldl/4= X-Gm-Gg: ASbGncvggKFSvHrjzJxsWs7j/xYKxHXUKto/aQSuIZb0rpL80i0ntkLvIYljYhNzsrn WzYayCVHapLyWImqCs9a31CJj1LCdMcQ137yc+eVso1F97HYkBLHMgIe15eUkQLUCd6DfWiCB/m xUTPMoa9ldfFBe9L11x3O/OWqG18TLzbkzCpOkI3OBQrCmzRQiOcHB1NPyWymBNsTQ81hqyTCuB XNu1vaYxrTrUePfxXtQ0PRStUN1p9umrejrmzX44eJF6g6EcVAgu9TGOYm/l4apXFDSwS/Kb6B1 FvXQJ0Cdw7Pilm7yTDf99L1AWh72jwTLzLP2rElhToRbGCWPrct739neU10wuBLl1RAb1Z1YPZz C3QUyzqrX08Bdv7wUxwgpaplpeUtRSZQW662+JWMKSsjMhoItpl8bWmPm/lJ1TVkZ8LQvC1EG2j 4gBcQZwp8/+jQelrrSGMOM X-Google-Smtp-Source: AGHT+IHTEmKUIzNdLgvEQRbO50q1BZhjiXvUCcwaLg2H2qjiXiq/J2JisVHT46P76rEeOWgp2DvE5Q== X-Received: by 2002:a05:600c:4ed0:b0:459:dfde:3323 with SMTP id 5b1f17b1804b1-45b517cfb81mr60478385e9.27.1755996526351; Sat, 23 Aug 2025 17:48:46 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 17:48:45 -0700 (PDT) From: Bryan O'Donoghue Date: Sun, 24 Aug 2025 01:48:23 +0100 Subject: [PATCH v2 11/37] libcamera: software_isp: Move isStandardBayerOrder to base class MIME-Version: 1.0 Message-Id: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-11-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=3477; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=ezFIPvA5CNelaul8+zGJV48vGwnX3ZJIvKfBKS23Dik=; b=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFeY1KzCNiftSUNIYmZ5WwHfSnjo/ZVKGNN/ JmnRekeGvyJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphXgAKCRAicTuzoY3I OiiKEACfSVFx9TwAEomoRAhwpJb1NhQtvWRNUN4zwczuNMCF0c6Jt71ddSFER4tkPdGDbelgZuv Cdq4CYU/yVAhtqeS7iCg5uLNtlOGJrZ8B9Q7LQdxy0rraOrZttsX2RH2lG9AVk8nawBabjDTg8j Ktr5P+j/fPYnzBVhrNSR6KL/3MJjkFLfmGKCGZb125aALbsdILlI6Eiq8oB625CZ/Cja9vy3dY8 7PiuhKum/USLwT81Zur/bMXCXvC6wW43GciP21DYkhRnEygv3qx+zBUe6CzI0F01AVNWeL+B7nS dRly1LwLk/tOypL9Xg9q+Jsr76vq+/vM8HvsEtqecyFncGXt4qCFdkny9jQVnrxzn/qA0e0KRsM USj0ALuOY0dVJ1yubZ1p2v6ikEqfO4Qw410CMYDOqp0FIsq1fEH6myM5mNSrMBVMBgoGEmpXVMP j2FgTikmpqkWE3HtBn+M5CQiEgrb5Q5v5688iVtAD5B65FmJBAYsycNiIwOv6nBvl5qHCqZCtvC BFuNu8AOU+OHGoKLfE/tKhApsH7xEKM3oJG7fxH/IYWl8RhZfuB9g7KS4JTadDNYCsgIDkqXzSs 0FmydNrSQCHHLrPjc87tisSlsj+V1HzZl3BlMLYBhP6a5oK7a8ujM22nfUb4s03EEJIqKVmCZhO MWoMKHgLu6ykqFw== 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" isStandardBayerOrder is useful to both CPU and GPU debayer logic and reusable as-is for both. Move to shared location in base class. 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 ------ src/libcamera/software_isp/debayer_cpu.h | 1 - 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp index 75e4bffab0f082bdf6e5bdf3030b9f49d4877524..c16ce44b181edfb94f2532db76ffa4fc222c588d 100644 --- a/src/libcamera/software_isp/debayer.cpp +++ b/src/libcamera/software_isp/debayer.cpp @@ -227,4 +227,14 @@ void Debayer::dmaSyncBegin(std::vector &dmaSyncers, FrameBuffer *inpu dmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Write); } +/** + * \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 0af66b556bbf8993a66042a3a76cd50582209bce..214bcdd3c535bae7851d6e0221ba68c19785507d 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/software_isp/benchmark.h" #include "libcamera/internal/software_isp/debayer_params.h" @@ -87,6 +88,7 @@ private: protected: void setParams(DebayerParams ¶ms); void dmaSyncBegin(std::vector &dmaSyncers, FrameBuffer *input, FrameBuffer *output); + 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 9fce2a143ac9585eadcea41744d680bc9589c507..7bd1fc39266f651845cc7a87ac991aa67c36c094 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -282,12 +282,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 diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h index 0b4b16e1a3b64f8eed25b6017274b21c9a89a1ee..a043a954134e71c625a8d2e493c45f9ed22624cf 100644 --- a/src/libcamera/software_isp/debayer_cpu.h +++ b/src/libcamera/software_isp/debayer_cpu.h @@ -17,7 +17,6 @@ #include -#include "libcamera/internal/bayer_format.h" #include "libcamera/internal/software_isp/swstats_cpu.h" #include "debayer.h"