From patchwork Tue Dec 2 13:45:39 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: 25328 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 F008AC32F8 for ; Tue, 2 Dec 2025 13:46:28 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2E78360F5C; Tue, 2 Dec 2025 14:46:28 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="OOZcDnrA"; dkim-atps=neutral Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6C22C60F2B for ; Tue, 2 Dec 2025 14:46:20 +0100 (CET) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-47795f6f5c0so32984605e9.1 for ; Tue, 02 Dec 2025 05:46:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764683180; x=1765287980; 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=nivFNcCIHsaOZPEeps0+pnpIxnf4gkOkum1uGeCG8kg=; b=OOZcDnrAIaJEATiiN1Q4DnRaCWBnPp0ALon9oYtB2Ii7bLNM6E2nlapcdlRUO0OO06 W5ytibjC7PR3fIFY0PzBmjZVMGbQ+7bSvIAMB31HSh4bnzBqjz2czMEk0VHU8wL4EiEn 8goZMHYkoTcY+iOEy5dm7kdvfCVG6MPbV7mCoNzbGtJ8zr/rJWsSSQBHAa32L4fmuH1y Eiya4EWGjE2UMrvg2NZtcvcI8pdfnt0c310cHWu/z/nVzpCRGfSGuSbqCJFyLpxdBugO gcfxD28asmsa/6ksz7iUWNjRksJ7GGlLaKqmBzchCjlVZ+bG6+ZqunHAs1oj/XVoIu6m iFVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764683180; x=1765287980; 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=nivFNcCIHsaOZPEeps0+pnpIxnf4gkOkum1uGeCG8kg=; b=g2sg02jJ5OozvKZpHzefTueiFWRtXo6wqG61SWUYGB/79d0/y/ZYmLLFsCygnf/qRC 2NzkquEJchYxjLWxBykjnBGPl8Zak8ye8KGBwRD3V75P1Tm5bEvoi1VN01r51yrUIPA7 qRPVB7OqffLFzNosMt8fxKLspgRKkDstLxS3dL2N6tAfHc0SyH7ycgYv451gbD0PzTWz uNLBnZ6aNsu5A6BcVopGi3w405GNN3/amIFeW8pJaz3SG+6Rtksy8shwUPLwSWgbD5Xn noPtyL34bIwfXEd56Ssm2w3rLUKFm7vlDET5fwKIOl2iROo6BxNAKLrMlHi9igRqVCvd eNBA== X-Gm-Message-State: AOJu0YxgLIle6Zlvdsf3Hn8xY28qjj6Ste12Rmj4LoWHOQBwUL9jtIZr F/VJj8Tok+Pcu6Wg7iSwufLkxsaKFKI+3wK/iMTjVX2i2vDwV1s/L2NPZtlQDcnP6NyrLSlgv6u 7WmUn X-Gm-Gg: ASbGncsO1nVYFFQHsB0NjoG4WoKy6VUhmifBSJTAlEWcDxVuj0aiaxmeHp6TY6a+MY6 QkrI8n7d6glan7VDtMbN3aMpsGdrnscIEMNHLdLlbFtig2JxiqTtGq9JQtCdBiCjSrJd7QtFub/ vcR9RzqXVbH9MtRq46OQBA+Ni07dQyh/JqDhPqKErzkdEFr71/0KeqL5qoLizlhQYdPnye0Sfbb TRvZtEXiZXgImR+LDd1QfM95S8cWxtA5taMm9EXnLuGnyJvW9pXuMDdvn+wIlmGLW4TYkyJIkoC +azN+6u2IeImbVKYVyXhZkhoK/11hf1r4fAWlv6YL1QWC5S6l8JWgEDbevhMcGnYCc3kUBVlo6d G8wY8GbfyR3u83ucbpwJYeEkjzr0TcE/Lbg4MDxEePAzcsVyxOjf9GWVA2zcZQ/AEEtamuSiZrH +dun6M5OQfZVH0GTBzXElJTOgDwu9R27HdGykm2aLpMAm6IdHYMFi6WHSIWF7ggiVeXMIiwtNaH CnKEA== X-Google-Smtp-Source: AGHT+IHt/9vIppjRGfU4/n9GiNKPzEPhqhNpUtJkvFIscW/5xTxxJgXpdVjYnvxVDCHU1QtsaDmSGA== X-Received: by 2002:a05:600c:5253:b0:477:63dc:be00 with SMTP id 5b1f17b1804b1-477c01bf726mr362385535e9.25.1764683179693; Tue, 02 Dec 2025 05:46:19 -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-47926f0ec69sm19383375e9.1.2025.12.02.05.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Dec 2025 05:46:19 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue Subject: [PATCH v6 19/24] ipa: simple: Add a flag to indicate gpuIspEnabled Date: Tue, 2 Dec 2025 13:45:39 +0000 Message-ID: <20251202134544.662446-20-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251202134544.662446-1-bryan.odonoghue@linaro.org> References: <20251202134544.662446-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 fd68dd0c5..a14fa22e5 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) {