From patchwork Wed Jun 18 12:45:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Bouyer X-Patchwork-Id: 23596 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 9369ABDE6B for ; Wed, 18 Jun 2025 12:44:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B3FC868DCE; Wed, 18 Jun 2025 14:44:44 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="lay0aaMq"; dkim-atps=neutral Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazlp170100001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c201::1]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 49F9668DC9 for ; Wed, 18 Jun 2025 14:44:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TktNAgGlkYAcg9PkR8K2N/x7QGarGekBvZq/KievuGgdD1TvV/7zoD7LPxaYm7aoFeIS0WrpEYRBiCsU00gwdtFInp/ikd/5fJpsTDjyhbIlLcW+3MtSIWxtG06yThmVTBzahpe3XXhigIN0nLyfUeI//n4IzhVPlRuGGkWQKjuN8d7tb7WcqQh6OhoX25yrwGYA7CVDd97OEXCVnZPlV7wIBF6bgrAROIvvFmKZpJ65oIl10P9oBY8ki0ugrsMR2JydlbDjJ0X0oL3LESED9Sc6PKBAmbP8py7bAWqB0oGxyAC4xbd6G2C9p2e7QCuIFykgCnhQXQbZ2aGnpJp+cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hTEF7pYw5YdqXJ8zarRLMx0KlhnsLJL0ZKMHluXPDb0=; b=UJKItFMw081jiXZpwEXUHveHg7jeJ3/fTfUvP2RPRG5zdV9sgjy5Q+zArmOWHYng1rbaUqo7WM8fmJi74bj3IEJuUnOZRtvlgmIl3RQF03EvrD2z8LkiJKPARrs6Q3udxR0JS2m96AHp76PUMJEBEL0VFaTL5oM5QeV1WycQFJqV73XpYar9H5YTXd/CRZBW8eB8HD/joYc2r5uHrAghQP6hSefu0cZNMb9OGFMr2cMdboq4G7Wd3CGBoJuVPvhJkyxrKAAMU8RpRhQ6dfnSyDDGEoa/JBpj/nxa9hmG4hihbEMhmByArfoFhxe48zFiRA+FfHUEdiyc9cXwTwBkHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hTEF7pYw5YdqXJ8zarRLMx0KlhnsLJL0ZKMHluXPDb0=; b=lay0aaMqi+ptx/o3sglt9eGyRCQLMtigL/DuH5X3mENfXO58xaqhIvPbTK57fpUTSDjhjRDfBilQfl/06NL71khQOpB7E+lm1mB0EYWzgXaR9GXv7mNgiUt/+KbB8ZK/6ghg5dgu+Bx+wpm6jaLLb0ucStcouUxVkPLTjLtjGHiYCN/sHS4Cr0ZbCsZnrhdDT6sdYRwN/tShaZMCdeqgXlCn2X4xVx7wz7BWhI5HVX8EO+MSogkdx5e0INybVUtNKr4WssBE63bwSYQ0bUfmf3MPq9lcTZWJPJsOys65Uc6KhCIqZrlABQpJ1Nk2CcDw7fXOO+P6rR+PG77DcC2lBQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9817.eurprd04.prod.outlook.com (2603:10a6:10:4f0::16) by PAXPR04MB8272.eurprd04.prod.outlook.com (2603:10a6:102:1c1::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.19; Wed, 18 Jun 2025 12:44:38 +0000 Received: from DB9PR04MB9817.eurprd04.prod.outlook.com ([fe80::144:cb06:336d:abb3]) by DB9PR04MB9817.eurprd04.prod.outlook.com ([fe80::144:cb06:336d:abb3%4]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 12:44:38 +0000 From: Antoine Bouyer To: libcamera-devel@lists.libcamera.org Cc: julien.vuillaumier@nxp.com, Antoine Bouyer Subject: [PATCH v2 1/2] pipeline: imx8-isi: Add constexpr for maximum pipeline and resize if needed Date: Wed, 18 Jun 2025 14:45:40 +0200 Message-Id: <20250618124541.2340270-2-antoine.bouyer@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250618124541.2340270-1-antoine.bouyer@nxp.com> References: <20250618124541.2340270-1-antoine.bouyer@nxp.com> X-ClientProxiedBy: AM0PR02CA0106.eurprd02.prod.outlook.com (2603:10a6:208:154::47) To DB9PR04MB9817.eurprd04.prod.outlook.com (2603:10a6:10:4f0::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR04MB9817:EE_|PAXPR04MB8272:EE_ X-MS-Office365-Filtering-Correlation-Id: 0d8ef6e3-6b64-4498-3ab3-08ddae65e2ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: wWLEqTc5h7i/2mCVyU/XEnSXjQd1r+K6xJeEvXGh0AJWnUaPeQQG2/C6c1ozuusjYc6VVkVdFddgEnnsVtNG/uuRLEWGz4cv6rNwfwLg6JBwQf2U9rVxvGfP6Q5AyIwzT6umDYcOtLyVPyiuGAb59xo0awWG5IbiHOzfxt7iDtIwFHZYuVBALf8+DzQx5m5VXnSW19vgnPZ4NmXsFKQq1qdPW02puFcedJ+i18vTP3C/3hF8ijCuo2iD0fvAHUj4B8EhXDyN3PdGbBphtIpcdq2zTu2sospV4+gmQI5mRnWqQqR76FBHF0r9Lrr2vvCeks6k4RsW4dAMy0FYS2hAGukrBe4d+ktMiupJKBVjkURTzM2V3t2jTJ81+jG/vExq2aU7j2CdhBVm2wFIWKD1MookCATCzeCi78/giIsVIDY4Sf/nhHQ0UMnFnPdhJ/tmVVquPHIt3pOcEF+8ZeeAVaJdZWMhOwHubP/8XK05rPkxvQeT44oddPERM7BxxY4AybFs6gqKHS2lWSxC4r25/GsftXLK/jc5L/VgB9p/vlVir7yDe4joL3d2nB4E8fvbNX7K91K1oVOdSqCML4P7QqfF5aDuTWMMh1t02QJJEK47Fzo+2xzPz9hVegY3jwnxy9ingA7I4/2/XRYjpu4V3WXb2xJJoOobwSocymuJBy4DeT0s6ScYMUOr4aaG3FyY1Z6aoumD5X88rzu+xtjlrZrw8YcvB9ePQjZg6NuclkI67uWxcwRQ66ddmcapvCyz6XeIULJOqGCdTYp4ANgXCrNIrQw1t2ZfIRw1lK05JvLMcMLCag6ZPVF3R0YRGTJ2fMVV4aaeilaiYe1gy+ODh3PU3K2hKHu/JFR6q8uEnkDNGcZbGVDHdRgFKnTAamw+fUmQ5jb9g5XLTGlClTod/SFj7HqN5Nm8Cw2kvwmJv2uRSLcHjkxsCVfUFNi5pDG6xME9fbHJsonBKwhWj9Zdv5jjrDfylMTgRN+UWSIbxso8zAvm1gaN1g6sHurZE03RS5se6Um5uRFk43GCWGlwgBP+3IwTMm/DGGof9Y8LhzvC81HpkNyFeUBjVZDv0CyQaUHBE5gbF2Fj5TC1pxPPQAvIAOUMq7CLPnuvNcTfPfdbIa/pR0n0EK76vvZQWOV3aMGQXE5aeM0zC/bhIUwTopmGlMdIPMehFe1FwS4WhpCR3xVw3FY3EEZLHcARRv2Xare0mCC2eU1ovZGtOrxfM3IMoP0ZdfqJQwOTi1NfFq3H9NDruG1nW2Qw8OytHarGK24MfWMgA9cKPYabDUEIYwfpnT+uvcmaK3OxrfZXl/B47k76c7EYQhS2NqY3WirvpTA6uLcRbjoqy1NDzB8kXECChLdBWV8fpIp9hBT4Z4jfd8bPpmVrXJE5Hzs4ng65ePzbNpe4OIgUXap5bAu3FZh1kDdJuy35pI+bS1zRE29W0a8brBk1Iut370Ln9ftEaEM95QDnoDRzh50royqvyA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR04MB9817.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TRwZ0jox/JKvHnc0dCJ3f4v5uEF1mv349gNeJ1+vp6MFbmak5kxIiFxGC1tiME0WoG9ejLxnP3j8Kd136/kXeVoVYU1W/nWn8lf/HyYvkACt/D/+zkjzj5dmzLzkq+BHQm3ACA7FxKIrB49S4xF69wOuI7QZoeRduL46itbFgifz7jgTD5PGTelc7QZ/mJAwdcvsp7bu+O4oFDP+bOvaIJrhC338SBZ96rkJCtbf4UowpkhKl0fXvEUfgR3ux1/To2T3QLsAJFcKk19vtea/k8e1FtG5BmY8tiktvnyPRxUqHwSZ/paJ8h4+NbzL1k3HzGik07gMv2l0GWErLfWHvyI/oAU987Od+e2hdP3wFn1afqyRpYTloFzvmma3BDjgxgymMSLT5O+ouWMb1vHwTpuynrUka54swOSJtFPkC2RtKdIJgYwGNYMy3rgGuoxQDzf5j4Ij8A7F+o83RON2q41MMN2Q8AEYgfQR7LHttdcBvRAoEASvZRUd+WaLPcM0WkIdk6XPNhS3eUNgFKYWdushgCVnoEt1RFgnY8Tv8JBI/pEH40mGISzP+lHTs6fDq43SGc4zq/ZP12879Mll1O1dFoOmHclJR7sQp7l1/8lQqoODshbIs+XXvR2A1vzwG1tTXg5PVuqTex7GFiVNLi8OiudDpAoS2FW41J6U4dvWGpYjqQAdzWXPTT8UepyHVo2D28yNW69CJ3ENhMEjLAtRP2q7iyXlkkP8Pf5Tuhmlft83GeSp9XHVMQYWFjZ0YH7e6lwHapDogdYHdAY9aneBqxyrzvrXqi2Pj9b3IxkxFoT2R/xWPUv04GxaARDsPwM/Biyuuilso6KAZHUU616GaCi7rkqPEIYjKLf6yRc5+lQ46TSdS8O11fQ5LcdzhHeOpKdy55fburZPKhVoSUQthiaUbsGTLQ8Zteztbj2bUme6mFfBo3r6UjX3gOBPmC35/6rdswe8Bz9F02YPY2kyVs8iTHe11rsNYlrVjEL6GS6FU8CqDMg3+Mi4Zb/+63nLQXiT/bxYT9MEb3s9rVv5l6dvYtY+1jv4/8HIWZakz+Cm1CmZwIwE4a3H7dkQm4zyEYJhyH8SrT9XpZvGspeq0GxMMuiiSiur9Ydq2B/byKqQzwt469gpeRAVYO5YDhZh4aoHgg6sxFcoOCWCJB1qqeqK6RdYXR6TCLwlKXNoO/XyXbA1Z2Ri9+8SNk2MgJFAC90IJpNNzt4RM34Zj9ODYWQlUYh6BD1rMSSkHs7nwBvdkps+kpAriaha8Maz1KlATyiwjL44qIU9aYRQgLZS/BysXidjknySCuc6hCgl4htql8WJBO/fWJJrIFRibDAhWuFc2PrDuG7eZbOhbt1/w0n7vdPjyZem50BR3O3I/FRUaGF2lKccYd7b5iw1NThZvs6l4We7Kkd9hyRsY3e1O9r7KwB40yJ+WdTbFKwVTQIBnUqT3Wlaoiv7hGHUbZMjaG9EMngg4ZzaaHfOUR3aXFTzaqvy/YwSnAOjc0AfqPvsfeYbIghSeGlVbWTGiLB+zD9IArxDuIwA67MjJKNfpwwKJMsfjKQkHfMij+Er1osH1fEjJMFpjDR/TW6KA1BTTlhadOTParV7wkEz3g== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d8ef6e3-6b64-4498-3ab3-08ddae65e2ef X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9817.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 12:44:38.0302 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vdbOCIsJ0Lz5mnj2S5nhBf1fDq+hRfOBm1ppoVTS/S6+/+yMVMG5ZzBOfJEDFy7YdwG0lsQbXQWOeoGV1Olgqw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8272 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" This patch adds number of streams per camera as constructor parameter, and limits stream count to 3. Some applications may need up to 3 streams for preview + capture + video record. Currently, imx8-isi pipeline only supports up to 2. Increase constant parameter to 3 to match these applications' requirements. Minimum value between default value 3, and total amount of ISI's pipes is now applied. For SOCs which only have 1 ISI pipe (ie i.MX93), available stream count becomes 1. Signed-off-by: Antoine Bouyer --- src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp index ecda426a6021..186b623df186 100644 --- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp +++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp @@ -40,14 +40,13 @@ class PipelineHandlerISI; class ISICameraData : public Camera::Private { public: - ISICameraData(PipelineHandler *ph) + /* Maximum amount of streams (i.e. pipes) per camera. */ + static constexpr unsigned int kNumStreams = 3; + + ISICameraData(PipelineHandler *ph, unsigned int numStreams) : Camera::Private(ph) { - /* - * \todo Assume 2 channels only for now, as that's the number of - * available channels on i.MX8MP. - */ - streams_.resize(2); + streams_.resize(std::min(kNumStreams, numStreams)); } PipelineHandlerISI *pipe(); @@ -1052,8 +1051,12 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator) } /* Create the camera data. */ + /* + * \todo compute available pipes per camera instead of using + * pipes_.size() for multi cameras case. + */ std::unique_ptr data = - std::make_unique(this); + std::make_unique(this, pipes_.size()); data->sensor_ = CameraSensorFactoryBase::create(sensor); data->csis_ = std::make_unique(csi);