From patchwork Thu Nov 20 23:20:08 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: 25112 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 6586CC3330 for ; Thu, 20 Nov 2025 23:20:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2088760AB7; Fri, 21 Nov 2025 00:20:47 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="PAq9+Fbz"; dkim-atps=neutral Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B117C60AAF for ; Fri, 21 Nov 2025 00:20:44 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-47775fb6cb4so10206175e9.0 for ; Thu, 20 Nov 2025 15:20:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763680844; x=1764285644; 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=5RzA2VjoFGo8Y8DWFS3Wdghq/DKfdgt6/HWUREdw1BA=; b=PAq9+FbznkwBtxqT6zgW7MfP3ETuPiDICa+Q08weWmHmZ7eHZMfmStT3CvGc2iivSY HbdUNsxkWrGsy2C21u3kaiLyEc9rZBW4Z/M/g5U7X3Pwf8BYnPrWt1Z5pw9WWkMt4LNi 4JmyHJFKItRWsrGcsURHXwzaDnIJKoJH131wLJETyKSO9Dsu4fVrg/5FQ1eOxoUkzW++ Pas5ZeTTcZrDDiN7XzzRmyuKa8NY8S/yvy8jyuKqWNH2ZVAbwrjAXuhcdXKX8EDWaMbd GDf1FYJVwd3ZSam7SnE3VLfX5go+zZgo69UzxVo5O2NqlF1up10Nt7y5yrWEp7wP6svu qm/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763680844; x=1764285644; 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=5RzA2VjoFGo8Y8DWFS3Wdghq/DKfdgt6/HWUREdw1BA=; b=S8xphJhDfz+HcolQJU4GOJcF4EWStdUhKMQG+z58ym5HHNGznMuMLnTAWi4rlSe08s 3YN/RWXcFgDzn7hjdE6jzZ47aFm8jQBVheKW0GmLX96h1EhYX7vJVJ/+p7cWI7Jm9eMY uTBFc8tYaisP8a3XTHov1t93SkQkLwIechnxMXW+BXDPXbnDdBKeESUn9dmrS/Rha4GC 72Zz1IFQbMLNySKhrZDd8JA4vszYJn+4WkoWEPpB548UEcmCNqy2bzcPJwOUhXTmMHXM t+7ID26OIqF6AuDoOPs5HvY01/jN2iZqJrvkhz7zmH/FQOjgDbJDdIay9PtM5lfGpauH RDlA== X-Gm-Message-State: AOJu0YxgaU4IcAWht00jeq63Hd+TZVgKoszUVkJbDgvP2WLujqwif6vm HRITWTNlnrIHGlT1vECztcsDylDTD7I/W9tjEozYHNsgK9oRRWQcvdgQo6FiX0pdSr3oOxgOQ2c C9YIQvTM= X-Gm-Gg: ASbGncvSjYLnHRVxr3gHXVrO+CrUysQksR2SImL5myAKZHSd7TRDo1FQRJrooyCCxgn YGTAslDiVmmoYYSKiXqgQQKd7P+Es3GSSY22lZl8Tt5QF4I/nSM/oEMAtIvmb31nQf4XJLfnf3Z rnpdW967B/bOBB5uG3sfQA7EPwHfNNspKbZisafdKfxk5nXA0WyrL8EAxiGGl96S1ESAfNtQeda 6iDCCSUUlxaMP1q8BUEutATrRsyQDlkszYSTL8vgimYDTiDs4dFXDlmxViV2ma/+O14VPcIsncd XMd03Ig8z7s9tXoJeiRTOswcDSYtD1+4nrxJ/OEV40uBdJV7//rK5RNj+tOqAbDvxWe2rJ9RTAW SUrkho/ZIbdGCZSZIWnsTYLU2MixSThrFqlaexSDVBr/bDPs7ac7P7Trh+giLA/D10DIzZPYLDL a7zIr0L7/hGJ3oo4V1wsF+0uh+u7cUhmWPkS4JLt7fBVKAjO/OZqCYI+OJ7gT7xlum+xW2pZTeY oprXQ== X-Google-Smtp-Source: AGHT+IFMg5r4Pc8TsMtLy0Nh+xdmQpXAKwKToCC037X7lghQqKfnXz79BXw+8Gnpd0RI2oXihcqj2A== X-Received: by 2002:a05:600c:198e:b0:46e:33b2:c8da with SMTP id 5b1f17b1804b1-477c1133927mr330985e9.32.1763680844054; Thu, 20 Nov 2025 15:20:44 -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-477bf3af0ecsm11618415e9.9.2025.11.20.15.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 15:20:43 -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 11/22] libcamera: software_isp: Move param select code to Debayer base class Date: Thu, 20 Nov 2025 23:20:08 +0000 Message-ID: <20251120232019.3590-12-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251120232019.3590-1-bryan.odonoghue@linaro.org> References: <20251120232019.3590-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 f267f8c7f..af40f5107 100644 --- a/src/libcamera/software_isp/debayer.cpp +++ b/src/libcamera/software_isp/debayer.cpp @@ -193,4 +193,32 @@ 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(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 dc0b8e67b..0b5e11abd 100644 --- a/src/libcamera/software_isp/debayer.h +++ b/src/libcamera/software_isp/debayer.h @@ -111,6 +111,9 @@ private: * Bayer formats (BGGR, GRBG, GBRG, RGGB) this is typically 2x2 pixels. */ 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();