From patchwork Thu Nov 27 02:22:43 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: 25225 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 140F7C32DE for ; Thu, 27 Nov 2025 02:23:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8895560AB3; Thu, 27 Nov 2025 03:23:30 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="jlAzLN9a"; dkim-atps=neutral Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D8CC8609DE for ; Thu, 27 Nov 2025 03:23:27 +0100 (CET) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4779a637712so1750725e9.1 for ; Wed, 26 Nov 2025 18:23:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764210207; x=1764815007; 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=bm3VvIoYtilkRcrlkHwpUjR5oXGGomKqNNLnlTko1eo=; b=jlAzLN9acVCnUfe8841H8sYcF2aeAVgo3jbuiLRVa7PzUm8UNmYSXkmqK73NgRWcV3 WaGJXqJIIgf1wCMari4fOm/WRFmKU/l5QGXgg7PqNq8ZLQ+de+hOMRg1t1F1mVnFwg7+ kTUjMVK3Gw6rrzXkVn3oIN7wHxWmcYr6OiUV1eA7XfoYa2dTlEPqCNBNxMT/g4ydkaTI y9AeaIf3BWK1dwng92p7tAQbTYMEIK7uOFpb6Dk1nCgBtQxpbC33BQEEg1k8EAre9PyJ 6AsJ/obm7aR6UwlqF43ACm0+3Ug5zDbR2Ri/yMLeN3vS42dGAdRhege526HIZjRflr9a u9BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764210207; x=1764815007; 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=bm3VvIoYtilkRcrlkHwpUjR5oXGGomKqNNLnlTko1eo=; b=l9oeurKlmt4iu3jggV2Nq9hHyM4LdsL+GW0DmPv809+ibrQcM1N1IBIwC8DU5HZecT j477oUVdlSi3jluBkeMTHWe62uGI9TmUkL6IpP8alcxGaDFNh79N5x9AzYB+01lWY/I9 CwkzEw0UaK8IwjW+2xdgMzBkef5MTlaMfBLW7LGJZS/5XeGZEG2XEj6dfFdxVun03hl+ wS9D787zOQqqhlLhdDKqpif+mXv7PYtrDy9eKEL1oYPBQouBOHyMeBG9QhqfK4XB6HHJ nvMzchAt1ESAgd1gUIEZmZY49RtQ+9qrrDtsCWXvN6CInnio64/5nZ5KN2LllsiW4jrF SSuA== X-Gm-Message-State: AOJu0Ywd8VP/7GT6mGAie4dflAgP24zvsQ/lDc0ND14eySFD6nz7gAcl 9v6jcLdv+Z9H/fsslmOCBgEs5yJCnKZRSrA+NMZYaPiTelkicog9dZOF71FIuOCd12x6Pmol+Jv ezXRk2qo= X-Gm-Gg: ASbGncv6e1K8qt/vvUu92oKRptUZNavZOcIR4DTBIlxCZmTKzyEgRKy/TD5SK5zGRzW 8K/iLQUXxMto1afbE2uaW3aB3NQVURnJLOAmxcq3IiCEZq7p4NNI3DlX4RKcWMnNIwrRR+dUKWY r+NlgoY4a5Es4aLY7lICLX/3vHssbmAl7REhr7ol+xg4rdRkz2hOxOmDYFjQFoi/3FcJjcU9YO7 pwm+ehWvVAKZvooOA4q0dFdAZ90HC6OifxEfk8dEcvfXHcmKaeHj+fDfz+cdXEguVtDiJ0Z71q0 Nz0KNg1EJ78UleJVHDTTbYsOCcYZ0m1/f8f3IPqlNRMx452Cv+GTP4RpsoV6hMUpt7yZHPngAuh iUyGLdSjMkECCpx3XEigFwe0Jqa5IYAvaUEYpBVj+FqvIAlkWtWBdmDXRdMrPn5ixkI6Lrn35IO XNnnDZRiM65c4dvHalDvloPYHb97Y+aY5BaOU+9Q49pytlYenvgpG6QEe0oRRtamqMsHU= X-Google-Smtp-Source: AGHT+IHUIbsxLRKbPJXH8ntpEMQFKbJjN3FBt5OHbba4Qd7y0U6mD/tVB631aZ5vTxvsEiWYmlPBQg== X-Received: by 2002:a05:600c:4e87:b0:46d:a04:50c6 with SMTP id 5b1f17b1804b1-477c01ebc76mr208671775e9.30.1764210207264; Wed, 26 Nov 2025 18:23:27 -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 5b1f17b1804b1-4790b0e21e8sm71549495e9.15.2025.11.26.18.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 18:23:26 -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 v2 11/22] libcamera: software_isp: Move param select code to Debayer base class Date: Thu, 27 Nov 2025 02:22:43 +0000 Message-ID: <20251127022256.178929-12-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251127022256.178929-1-bryan.odonoghue@linaro.org> References: <20251127022256.178929-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 parameter selection code into the Debayer base class in-order to facilitate reuse of the lookup tables in the eGL shaders. Reviewed-by: Kieran Bingham Reviewed-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue --- src/libcamera/software_isp/debayer.cpp | 28 ++++++++++++++++++++++ src/libcamera/software_isp/debayer.h | 3 +++ src/libcamera/software_isp/debayer_cpu.cpp | 20 +--------------- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp index 8cadfaadc..cea30af67 100644 --- a/src/libcamera/software_isp/debayer.cpp +++ b/src/libcamera/software_isp/debayer.cpp @@ -336,4 +336,32 @@ Debayer::~Debayer() * debayer processing. */ +/** + * \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(greenCcm_[i].r, greenCcm_[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 f4373ddeb..6903caae8 100644 --- a/src/libcamera/software_isp/debayer.h +++ b/src/libcamera/software_isp/debayer.h @@ -83,6 +83,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 8f42d706b..6be5cdbd5 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -758,25 +758,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(greenCcm_[i].r, greenCcm_[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();