From patchwork Thu Nov 27 02:37:36 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: 25258 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 B333FC32E0 for ; Thu, 27 Nov 2025 02:38:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2A40260AD0; Thu, 27 Nov 2025 03:38:32 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Aq1Gl/yL"; dkim-atps=neutral Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4445960C68 for ; Thu, 27 Nov 2025 03:38:28 +0100 (CET) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-47798ded6fcso1421985e9.1 for ; Wed, 26 Nov 2025 18:38:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764211108; x=1764815908; 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=woB0MgjmWr8Zdvt/377QQWSwZ83OLYd14divLlJMGJ8=; b=Aq1Gl/yLk/dc1rGhnplb5F9RqNiDuXmregiDJSHRBnxGThTLu2thuNwvJPfPg6v16l njT/9VTOclgqhTgtKTBP5DaKgP65E2RosnDkzGaalmFzBQqaNNcQkNyLqbim8MPw2YCj 3RdAhNkPzP+oDt6R9lfDj7r0aSZO1XGrma16NF8Tbfg5PFfgNBNxsVa3DOJx9iK7g65u KTfVkXzRDOdlKehFafjvfG06N0mA1h2kDAtqD6CCZ105Xm9VfptwekYJa0sN1HcXgTyq Xeq4GhW+NEePF7Q+HCqRBBbE4PQlXSmqt/FlVlkthDcI1DX6bMrYaipiTNTD4rf1tJ/4 FtiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764211108; x=1764815908; 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=woB0MgjmWr8Zdvt/377QQWSwZ83OLYd14divLlJMGJ8=; b=Kvuvs4IK+9loQJnlG20RQmGAR44kb5U+6WCSk+04W4+LPhO7yhSNhDt4xZBwmPuJfN m+q0EzrUFQw0C00hPmKo0TP4Y0MxFL5cpn7Aia2IN8Xlrxyo11XGl1YAT69wuRBhu1xr 6Y4FMXLAOeKD2UljWBrd1sZrdSBTUL7M3EGrKuE1AEXGyfkQ/spiyIn1pswjTdbnsd4c fAtdrerEoUj/UCALVddSMiSAw0yUn719JEevfkqMTZIjOMIeIiLKgI+FdwPKWtg31nmv OhIDxkoA1/KPwXM6AcvcgsoXv/WAaaY4MFynDqgtepHWytSGXWydItGip5xuMyPctpbi 87BA== X-Gm-Message-State: AOJu0YxQdbPQTex4nRQBD4E7WEqy1jiXUX+LERxk3LPSWilp+/mOgJo+ Y5+bw1xrbbKSPG6ROEfcBWLI264Oae21MUylRtedoXcW7yXfPnoOGc/n+wEhvAat2vAGw3K8ZUR pj4FrXa8= X-Gm-Gg: ASbGncuqUCMVsKLF+Sk5q4IwfU7vPmVSrhqg0cSdSE/mvOdIRhM171Ud7n45E0fSe8o 8XcdqCL5lHWhMKEEplvRghhqR7C5cJkav49IIykd38+ZtVWE1dCK6CWd4FuSjHEDysOtfcXGAx8 5z5wAbJL6eqp0Hw40W5sWlze4Mw7OVp98wmZXrSQmusuS6a0Oe4O6Lbbr64GtRQRgceD2aM5a0a hoO3gZ6IaNRI9DUP0WvOUWYaVrnqZNB4uncmg9pRU2QVAli+zdUctAKcu/iA9kPq/hM3ygYQuvF KwbSEvi2Ien4LDF1aKig5JZR9Z4oW6dtf/QMKoFzKTLfCrtnY46sdOvdHKOThUe7eVfKxDa+OoK OUpCpPBDIEFKH2A9GWSw4SurPx93Xyebsbsz6w+EbkTEK+g0tcMSCpbNdwwn1IKhLTLOw2+HpBO 3ozbZNLrnEcgCw3jKuzXGDdnq2VEkY1eBUgLSJeEG5XkvxI71bVvyzQ8h9BgEUzrmmwx33VmtAE SIIng== X-Google-Smtp-Source: AGHT+IEtUuVL65j4R+Pi3HuwdEsPnLIEGhWstSoMBW/2jBbnQaqFFXnE5N6r1qwislYeJPn3eHIExA== X-Received: by 2002:a05:600c:3511:b0:476:d494:41d2 with SMTP id 5b1f17b1804b1-477c112f7b1mr210333385e9.29.1764211107659; Wed, 26 Nov 2025 18:38: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-4790552c3c9sm58186345e9.0.2025.11.26.18.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 18:38:27 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue Subject: [PATCH v5 21/24] ipa: simple: Add a flag to indicate gpuIspEnabled Date: Thu, 27 Nov 2025 02:37:36 +0000 Message-ID: <20251127023739.179652-22-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251127023739.179652-1-bryan.odonoghue@linaro.org> References: <20251127023739.179652-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" Flag gpuIspEnabled in the simple IPA context. This flag will allow to selectively avoid some calculations or to generate a default CCM. Signed-off-by: Bryan O'Donoghue --- include/libcamera/ipa/soft.mojom | 3 ++- src/ipa/simple/ipa_context.h | 1 + src/ipa/simple/soft_simple.cpp | 3 +++ src/libcamera/software_isp/software_isp.cpp | 8 +++++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom index 77328c5fd..aff8fcbd3 100644 --- a/include/libcamera/ipa/soft.mojom +++ b/include/libcamera/ipa/soft.mojom @@ -17,7 +17,8 @@ interface IPASoftInterface { libcamera.SharedFD fdStats, libcamera.SharedFD fdParams, libcamera.IPACameraSensorInfo sensorInfo, - libcamera.ControlInfoMap sensorControls) + libcamera.ControlInfoMap sensorControls, + bool gpuIspEnabled) => (int32 ret, libcamera.ControlInfoMap ipaControls, bool ccmEnabled); start() => (int32 ret); stop(); diff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h index c3081e306..ee8fb6b03 100644 --- a/src/ipa/simple/ipa_context.h +++ b/src/ipa/simple/ipa_context.h @@ -103,6 +103,7 @@ struct IPAContext { FCQueue frameContexts; ControlInfoMap::Map ctrlMap; bool ccmEnabled = false; + bool gpuIspEnabled = false; }; } /* namespace ipa::soft */ diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp index b147aca2e..2bbe271d9 100644 --- a/src/ipa/simple/soft_simple.cpp +++ b/src/ipa/simple/soft_simple.cpp @@ -55,6 +55,7 @@ public: const SharedFD &fdParams, const IPACameraSensorInfo &sensorInfo, const ControlInfoMap &sensorControls, + bool gpuIspEnabled, ControlInfoMap *ipaControls, bool *ccmEnabled) override; int configure(const IPAConfigInfo &configInfo) override; @@ -95,6 +96,7 @@ int IPASoftSimple::init(const IPASettings &settings, const SharedFD &fdParams, const IPACameraSensorInfo &sensorInfo, const ControlInfoMap &sensorControls, + bool gpuIspEnabled, ControlInfoMap *ipaControls, bool *ccmEnabled) { @@ -106,6 +108,7 @@ int IPASoftSimple::init(const IPASettings &settings, } context_.sensorInfo = sensorInfo; + context_.gpuIspEnabled = gpuIspEnabled; /* Load the tuning data file */ File file(settings.configurationFile); diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index a54dcbaf5..8479760fc 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -130,6 +130,8 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, } } + bool gpuIspEnabled; + #if HAVE_DEBAYER_EGL if (!softISPMode || !strcmp(softISPMode, "gpu")) { debayer_ = std::make_unique(std::move(stats), configuration); @@ -137,10 +139,13 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, LOG(SoftwareIsp, Error) << "Failed to instantiate GPUISP"; return; } + gpuIspEnabled = true; } #endif - if (!debayer_) + if (!debayer_) { debayer_ = std::make_unique(std::move(stats), configuration); + gpuIspEnabled = false; + } if (!debayer_) { LOG(SoftwareIsp, Error) << "Failed to create Debayer object"; @@ -177,6 +182,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, sharedParams_.fd(), sensorInfo, sensor->controls(), + gpuIspEnabled, ipaControls, &ccmEnabled_); if (ret) {