From patchwork Mon Aug 17 13:40:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 27833 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 20585C3301 for ; Mon, 17 Aug 2026 13:41:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A5D426827B; Mon, 17 Aug 2026 15:41:05 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="YRWe3eWX"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="M2NJLNLU"; dkim-atps=neutral Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DE1886828A for ; Mon, 17 Aug 2026 15:40:56 +0200 (CEST) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67HD64b32238938 for ; Mon, 17 Aug 2026 13:40:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=svKD2n0AWJc 7sc0Ku9wMADkvDuzwi27J4gaFFbr0pfA=; b=YRWe3eWXRcHVl7jMt3Sb9Kx/yWd a1FffU3q2HRd8kdprnrYGR8iuzBssdmK99WMuoieu0l7xtyEQ1TSX8VJLmUkmZS5 WmTWCNM9jAGxtEKa8ZqssSPHWuqFhxqf5ag0aRUvuQDF9Xm961np1BhZXdTSHHy1 RKEkopQahBfkrKhk6V5blIe03kiSXSIPTdNbSAJQjnvfoS4402Rf0yfReVHLGay1 nCmXJl5yFfDusJR0AUu26igUKdX1fI+QqiZDIl1lXrWXHu1ZI7JWfP0SaC/GNRGe I8Bs9lNdXQk39m/hvrlwuuJq6WMNNUrdNlmvcEWH/cOtubCdlq8+jDOjS/A== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g3xyk95cx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 17 Aug 2026 13:40:55 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92ec3146553so617543985a.1 for ; Mon, 17 Aug 2026 06:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786974055; x=1787578855; 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:content-type; bh=svKD2n0AWJc7sc0Ku9wMADkvDuzwi27J4gaFFbr0pfA=; b=M2NJLNLUCGct24YqwXJMEXR2hGXD5Rj8/QJx4wJrYerjbaZX39C0nLC9hBX7NFoIuy /6XxAUMTLtHOJt2ZttE2W7cgD0pK9NfMWS7iI7g0SiVODc4jquz+kE3CDCX1Fuiq+9GJ wfHuMzvY6NY2nYQmvjRbFnXBKsv4TKbRourOBShhS0ORil/l+1I5yeGo4QDV6WhDcnX0 obU+2BDZEMgAeTM3XQC/t2jhi7RVRaCgjpMHozQq/VfT4yLFpgi9/y02FwyVvz53tTYE CazWqQ4AeJVg9rJ2CMenT7x8gJwAHb36jLk4rB4Ml6HPdjgB4T9KM0QPr6UpDcksSJ9S ktpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786974055; x=1787578855; 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:content-type; bh=svKD2n0AWJc7sc0Ku9wMADkvDuzwi27J4gaFFbr0pfA=; b=UZnwL3mmGa5Xe4zprypMIyrw3vAPsOXE3z6nGzmimMfPu9pGqzqy2QBEHTOIrDOquD KZmhIWeLTx26yJ8vruRtQjt2/WxhgRC7+puIQ1j435DAVdKyRq+gEqBBUuHtC+Et3MNk tmjoOsMdVunas5SnBoOATpVZtf05Psu0wG+WTpPdl3Ce4Yf2SabYpF40yaD/lr8q2Q7i WyVRRg6pw/DTX9wfbqiBSzloe0EtUpiK1AhSDeBCL2A7XVbb7bIgs42aRvSNBFoIvsgF 3bk79VxfjBJNmDIBoeJvkyKULzJjHi8AKMwPVnePhhe+WO3SA7c+tix+hownjIp2q95S ln5w== X-Gm-Message-State: AOJu0YwQN43nGFFnFtVdTLKPbCFzEyoHkloH5wN6iXsxRoZiFMxNm0GJ bykT/qRfE+gKBDMHl5qPY2s48Uh8FRBfOqFtPQgnKJKQgGpW3w59ZdEzuXaVaFYHX7ZIMcnkXTJ z+xjJpPo6w7sEN8UG3BBBlMMmzcFCxxfcLgnals1XtziBszb3XerPlH/zgR0Qrhj59lwIiH2NRd Z4jHrRv+al X-Gm-Gg: AR+sD13od3dBZmDZNeM/y1nVfsrFhdjdZFilc9ph/r6GSSwNJP7u1GGGt8g5idYpC6Q erKJHANUUcsaBmK9Pn0UWXqaWXm5lXxBTe1x0Zb5LIQTPqQSdKZqXKinsegT4N8KGYVbfNtTLtJ QUodSW/0H7IT2fjzZQoEH8wIHtcXRiK7GpUfWdRmCr7KHKKsDqsxp2qddouwUggS+NKeOZYZ3VR 8p8ZOhg0rMQxGUN54owB4uKr/JZG6/VWFdlaohxnkXu2t3bD6Civn3xXuJL3AJ1Yw83BJnGEux4 7KFKS+H8OFVCR6YbszIktigXda0BZbSj9/sK/H/N5zuSvI/xg6chGPxQSqxaz4KCw/fDtoszIet nP14uc8HYZDB/dYYRSrvYW9c6vY++ X-Received: by 2002:a05:620a:4801:b0:92e:675e:8eef with SMTP id af79cd13be357-936d2023becmr2360237385a.15.1786974054559; Mon, 17 Aug 2026 06:40:54 -0700 (PDT) X-Received: by 2002:a05:620a:4801:b0:92e:675e:8eef with SMTP id af79cd13be357-936d2023becmr2360232385a.15.1786974053998; Mon, 17 Aug 2026 06:40:53 -0700 (PDT) Received: from t14s.vakwerkhuis.com ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6a3d8517181sm772179a12.1.2026.08.17.06.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2026 06:40:53 -0700 (PDT) From: Hans de Goede To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi , =?utf-8?q?Niklas_S=C3=B6?= =?utf-8?q?derlund?= , Loic Poulain , Hans de Goede Subject: [PATCH v8 7/8] ipa: softisp: Rename ipa::soft namespace to ipa::softisp Date: Mon, 17 Aug 2026 15:40:41 +0200 Message-ID: <20260817134042.277168-8-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817134042.277168-1-johannes.goede@oss.qualcomm.com> References: <20260817134042.277168-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: 3Go0ODOjzxxxG2rYUO32Tt2z66zo03oC X-Proofpoint-ORIG-GUID: 3Go0ODOjzxxxG2rYUO32Tt2z66zo03oC X-Authority-Analysis: v=2.4 cv=dLaWXuZb c=1 sm=1 tr=0 ts=6a830f67 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=rrvG0T/C2D967D07Ol03YQ==:17 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=P1BnusSwAAAA:8 a=EUspDBNiAAAA:8 a=S-_Sen47HszD1NjcceEA:9 a=bTQJ7kPSJx9SKPbeHEYW:22 a=D0XLA9XvdZm18NrgonBM:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODE3MDEwNCBTYWx0ZWRfX9054ZHWemAge YMC/E6MjV2qPUA0PaWzHWDlMt+fg23e8uUNu8AdU9PVEST2EsC6s0dynj/2uCMI3iu4r9x9eBnW KAFIH9yAwZLbUoMHY+kgXQ5EPEnI6JIm6+oisBJp+XlPokrLJQbOBRw9n95RiGzhiS7DnCjPi1L fypTx49BeZcWkYqhwQWl6AXlrs40haVugdJWkdnEULQ1ZeGmNqkWpZtXgm2suVLCgsS3eJ8cSe+ YanGMs60zW1koCNJWtfIx3+I+0M3FF3/m0WPNQrPpznU4pv04hGKG0idu8JcHvSaDw8vW+Xk5eB wwkRDcU7weGOXgepQEERaFJMNKKU5j5ku6+xVu+q9qlmFvD37j98GT76/xoHk1VZLgZ7jl6C7me wXNpasiyXNnBIFDeC03Wwo61JvT4KETLlJpObt03IXHDCKCxW35RzF8dtfO0ecrm1hS+N/Zv+gO nilSI8sdgsOJ+U6CHgg== X-Proofpoint-Spam-Info: AW1haW4tMjYwODE3MDEwNCBTYWx0ZWRfXxD3HDIkaU9mA oVdH43+/yEQ9ZyikK211dUjxF7SOi4hOoQkx2XVSnqUm7ZMf/t2o+A6WTBUoVC6yv5R0PNAu+zM gd7P2VNQQfL+N1h8nHHvL2tLRB9ncfA= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293, Aquarius:18.0.1176, Hydra:6.1.134, FMLib:17.12.100.49 definitions=2026-08-17_01,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 suspectscore=0 adultscore=0 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608170104 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" Rename ipa::soft namespace to ipa::softisp to match the softisp IPA name. Reviewed-by: Jacopo Mondi Signed-off-by: Hans de Goede --- Changes in v7: - New patch in v7 of this patch-series --- include/libcamera/internal/software_isp/software_isp.h | 4 ++-- include/libcamera/ipa/softisp.mojom | 2 +- src/ipa/softisp/algorithms/adjust.cpp | 4 ++-- src/ipa/softisp/algorithms/adjust.h | 4 ++-- src/ipa/softisp/algorithms/agc.cpp | 4 ++-- src/ipa/softisp/algorithms/agc.h | 4 ++-- src/ipa/softisp/algorithms/algorithm.h | 4 ++-- src/ipa/softisp/algorithms/awb.cpp | 4 ++-- src/ipa/softisp/algorithms/awb.h | 4 ++-- src/ipa/softisp/algorithms/blc.cpp | 4 ++-- src/ipa/softisp/algorithms/blc.h | 4 ++-- src/ipa/softisp/algorithms/ccm.cpp | 4 ++-- src/ipa/softisp/algorithms/ccm.h | 4 ++-- src/ipa/softisp/ipa_context.cpp | 4 ++-- src/ipa/softisp/ipa_context.h | 4 ++-- src/ipa/softisp/module.h | 4 ++-- src/ipa/softisp/softisp.cpp | 8 ++++---- src/libcamera/pipeline/simple/simple.cpp | 2 +- src/libcamera/software_isp/software_isp.cpp | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h index 2363a91c8..64c77e65c 100644 --- a/include/libcamera/internal/software_isp/software_isp.h +++ b/include/libcamera/internal/software_isp/software_isp.h @@ -65,7 +65,7 @@ public: int configure(const StreamConfiguration &inputCfg, const std::vector> &outputCfgs, - const ipa::soft::IPAConfigInfo &configInfo); + const ipa::softisp::IPAConfigInfo &configInfo); int exportBuffers(const Stream *stream, unsigned int count, std::vector> *buffers); @@ -101,7 +101,7 @@ private: DmaBufAllocator dmaHeap_; bool ccmEnabled_; - std::unique_ptr ipa_; + std::unique_ptr ipa_; std::deque queuedInputBuffers_; std::deque queuedOutputBuffers_; }; diff --git a/include/libcamera/ipa/softisp.mojom b/include/libcamera/ipa/softisp.mojom index 66cf311b3..55b6e4d7f 100644 --- a/include/libcamera/ipa/softisp.mojom +++ b/include/libcamera/ipa/softisp.mojom @@ -4,7 +4,7 @@ * \todo Document the interface and remove the related EXCLUDE_PATTERNS entry. */ -module ipa.soft; +module ipa.softisp; import "include/libcamera/ipa/core.mojom"; diff --git a/src/ipa/softisp/algorithms/adjust.cpp b/src/ipa/softisp/algorithms/adjust.cpp index 52eb81d76..56e2cf0e8 100644 --- a/src/ipa/softisp/algorithms/adjust.cpp +++ b/src/ipa/softisp/algorithms/adjust.cpp @@ -17,7 +17,7 @@ namespace libcamera { -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { constexpr float kDefaultContrast = 1.0f; constexpr float kDefaultSaturation = 1.0f; @@ -129,6 +129,6 @@ void Adjust::process([[maybe_unused]] IPAContext &context, REGISTER_IPA_ALGORITHM(Adjust, "Adjust") -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/adjust.h b/src/ipa/softisp/algorithms/adjust.h index 49c1f26c3..1acf7cdf1 100644 --- a/src/ipa/softisp/algorithms/adjust.h +++ b/src/ipa/softisp/algorithms/adjust.h @@ -15,7 +15,7 @@ namespace libcamera { -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { constexpr float kDefaultGamma = 2.2f; @@ -45,6 +45,6 @@ private: void applySaturation(Matrix &ccm, float saturation); }; -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/agc.cpp b/src/ipa/softisp/algorithms/agc.cpp index 72f000628..63b41544c 100644 --- a/src/ipa/softisp/algorithms/agc.cpp +++ b/src/ipa/softisp/algorithms/agc.cpp @@ -19,7 +19,7 @@ namespace libcamera { LOG_DEFINE_CATEGORY(IPASoftIspExposure) -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { /* * The number of bins to use for the optimal exposure calculations. @@ -194,6 +194,6 @@ void Agc::process(IPAContext &context, REGISTER_IPA_ALGORITHM(Agc, "Agc") -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/agc.h b/src/ipa/softisp/algorithms/agc.h index 112d9f5a1..369446192 100644 --- a/src/ipa/softisp/algorithms/agc.h +++ b/src/ipa/softisp/algorithms/agc.h @@ -11,7 +11,7 @@ namespace libcamera { -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { class Agc : public Algorithm { @@ -28,6 +28,6 @@ private: void updateExposure(IPAContext &context, IPAFrameContext &frameContext, double exposureMSV); }; -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/algorithm.h b/src/ipa/softisp/algorithms/algorithm.h index 41f631703..53db01c9d 100644 --- a/src/ipa/softisp/algorithms/algorithm.h +++ b/src/ipa/softisp/algorithms/algorithm.h @@ -13,10 +13,10 @@ namespace libcamera { -namespace ipa::soft { +namespace ipa::softisp { using Algorithm = libcamera::ipa::Algorithm; -} /* namespace ipa::soft */ +} /* namespace ipa::softisp */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/awb.cpp b/src/ipa/softisp/algorithms/awb.cpp index 84f01b832..55fd326fc 100644 --- a/src/ipa/softisp/algorithms/awb.cpp +++ b/src/ipa/softisp/algorithms/awb.cpp @@ -18,7 +18,7 @@ namespace libcamera { LOG_DEFINE_CATEGORY(IPASoftIspAwb) -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { /* * \todo Replace it with a proper Lux algorithm @@ -159,6 +159,6 @@ void Awb::process(IPAContext &context, [[maybe_unused]] const uint32_t frame, REGISTER_IPA_ALGORITHM(Awb, "Awb") -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/awb.h b/src/ipa/softisp/algorithms/awb.h index 37893932b..c92bdbfd5 100644 --- a/src/ipa/softisp/algorithms/awb.h +++ b/src/ipa/softisp/algorithms/awb.h @@ -20,7 +20,7 @@ namespace libcamera { -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { class SoftIspAwbStats; @@ -59,6 +59,6 @@ private: AwbAlgorithm> awbAlgo_; }; -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/blc.cpp b/src/ipa/softisp/algorithms/blc.cpp index fca76f442..e35aabc35 100644 --- a/src/ipa/softisp/algorithms/blc.cpp +++ b/src/ipa/softisp/algorithms/blc.cpp @@ -15,7 +15,7 @@ namespace libcamera { -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { LOG_DEFINE_CATEGORY(IPASoftIspBL) @@ -119,6 +119,6 @@ void BlackLevel::process(IPAContext &context, REGISTER_IPA_ALGORITHM(BlackLevel, "BlackLevel") -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/blc.h b/src/ipa/softisp/algorithms/blc.h index 2933ff1ff..1d602927f 100644 --- a/src/ipa/softisp/algorithms/blc.h +++ b/src/ipa/softisp/algorithms/blc.h @@ -14,7 +14,7 @@ namespace libcamera { -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { class BlackLevel : public Algorithm { @@ -37,6 +37,6 @@ private: std::optional definedLevel_; }; -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/ccm.cpp b/src/ipa/softisp/algorithms/ccm.cpp index 58e17bbeb..039074494 100644 --- a/src/ipa/softisp/algorithms/ccm.cpp +++ b/src/ipa/softisp/algorithms/ccm.cpp @@ -12,7 +12,7 @@ namespace libcamera { -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { LOG_DEFINE_CATEGORY(IPASoftIspCcm) @@ -79,6 +79,6 @@ void Ccm::process([[maybe_unused]] IPAContext &context, REGISTER_IPA_ALGORITHM(Ccm, "Ccm") -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/algorithms/ccm.h b/src/ipa/softisp/algorithms/ccm.h index 27f11bcbd..2a2030a41 100644 --- a/src/ipa/softisp/algorithms/ccm.h +++ b/src/ipa/softisp/algorithms/ccm.h @@ -19,7 +19,7 @@ namespace libcamera { -namespace ipa::soft::algorithms { +namespace ipa::softisp::algorithms { class Ccm : public Algorithm { @@ -45,6 +45,6 @@ private: CcmAlgorithm> ccmAlgo_; }; -} /* namespace ipa::soft::algorithms */ +} /* namespace ipa::softisp::algorithms */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/ipa_context.cpp b/src/ipa/softisp/ipa_context.cpp index 3f94bbebf..0c7cbbf78 100644 --- a/src/ipa/softisp/ipa_context.cpp +++ b/src/ipa/softisp/ipa_context.cpp @@ -13,7 +13,7 @@ * \brief Context and state information shared between the algorithms */ -namespace libcamera::ipa::soft { +namespace libcamera::ipa::softisp { /** * \struct IPASessionConfiguration @@ -99,4 +99,4 @@ namespace libcamera::ipa::soft { * \brief Black level used for the gamma table computation */ -} /* namespace libcamera::ipa::soft */ +} /* namespace libcamera::ipa::softisp */ diff --git a/src/ipa/softisp/ipa_context.h b/src/ipa/softisp/ipa_context.h index bccf95775..2eed32f88 100644 --- a/src/ipa/softisp/ipa_context.h +++ b/src/ipa/softisp/ipa_context.h @@ -24,7 +24,7 @@ namespace libcamera { -namespace ipa::soft { +namespace ipa::softisp { struct IPASessionConfiguration { struct { @@ -91,6 +91,6 @@ struct IPAContext { bool ccmEnabled = false; }; -} /* namespace ipa::soft */ +} /* namespace ipa::softisp */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/module.h b/src/ipa/softisp/module.h index b5d99ba08..b7f79aadf 100644 --- a/src/ipa/softisp/module.h +++ b/src/ipa/softisp/module.h @@ -20,11 +20,11 @@ namespace libcamera { -namespace ipa::soft { +namespace ipa::softisp { using Module = ipa::Module; -} /* namespace ipa::soft */ +} /* namespace ipa::softisp */ } /* namespace libcamera */ diff --git a/src/ipa/softisp/softisp.cpp b/src/ipa/softisp/softisp.cpp index 111325d7d..b3f0d3fa6 100644 --- a/src/ipa/softisp/softisp.cpp +++ b/src/ipa/softisp/softisp.cpp @@ -36,12 +36,12 @@ LOG_DEFINE_CATEGORY(IPASoftIsp) using namespace std::literals::chrono_literals; -namespace ipa::soft { +namespace ipa::softisp { /* Maximum number of frame contexts to be held */ static constexpr uint32_t kMaxFrameContexts = 16; -class IPASoftIsp : public ipa::soft::IPASoftIspInterface, public Module +class IPASoftIsp : public ipa::softisp::IPASoftIspInterface, public Module { public: IPASoftIsp() @@ -333,7 +333,7 @@ std::string IPASoftIsp::logPrefix() const return "IPASoftIsp"; } -} /* namespace ipa::soft */ +} /* namespace ipa::softisp */ /* * External IPA module interface @@ -347,7 +347,7 @@ const struct IPAModuleInfo ipaModuleInfo = { IPAInterface *ipaCreate() { - return new ipa::soft::IPASoftIsp(); + return new ipa::softisp::IPASoftIsp(); } } /* extern "C" */ diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index e26f438d9..02a98f594 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -1603,7 +1603,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) if (data->converter_) { return data->converter_->configure(inputCfg, outputCfgs); } else { - ipa::soft::IPAConfigInfo configInfo; + ipa::softisp::IPAConfigInfo configInfo; configInfo.sensorControls = data->sensor_->controls(); return data->swIsp_->configure(inputCfg, outputCfgs, configInfo); } diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index d1fe02a2e..f29f78c98 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -136,7 +136,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, debayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady); debayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady); - ipa_ = pipe->createIPA(0, 0); + ipa_ = pipe->createIPA(0, 0); if (!ipa_) { LOG(SoftwareIsp, Error) << "Creating IPA for software ISP failed"; @@ -285,7 +285,7 @@ uint32_t SoftwareIsp::preferredInputStride(const PixelFormat &inputFormat, const */ int SoftwareIsp::configure(const StreamConfiguration &inputCfg, const std::vector> &outputCfgs, - const ipa::soft::IPAConfigInfo &configInfo) + const ipa::softisp::IPAConfigInfo &configInfo) { ASSERT(ipa_ && debayer_);