From patchwork Tue Jul 1 08:58:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Bouyer X-Patchwork-Id: 23698 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 990ACC3237 for ; Tue, 1 Jul 2025 09:00:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 063CD68E17; Tue, 1 Jul 2025 11:00:31 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="VCU7XR3R"; dkim-atps=neutral Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazlp170110003.outbound.protection.outlook.com [IPv6:2a01:111:f403:c201::3]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1547A61528 for ; Tue, 1 Jul 2025 11:00:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B1sR1JSeTcCctCqNIpp6MYRdrxJeGv/wuApDXGNbX73FaIC9GGWxxBrSHiM46/AijQWIoczS0kGOfBrDzhV3Aa3J+eDzlMwlaG3vvxp9MY/Kz3ost/rDKVOCht0riLskiCtgNCOqRWnDqaQu4pejuDh0brO2K2NKtZwHXmk1HtC9vthBJKWPMkXPkKziaTdBcSyjiVY25LlzGb0fhxtL6bM3uAEKrcqic0z9RuwUgb2v147/ImZ6H2cV3ACbLRDKuhtwK5gssuGKcOwSFMGh+rrYzZdwKvE13gaa7J6ohVePbfV3GT3gNRgVF0JxLaW4K8V+bI5o9W+/gfgQdc9Nlw== 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=9julfzi0G+JMJJYqCFRmgHdsy/+ZT++VVxWau0ySsYs=; b=Lm+5cTqWQhQVwSnC0zyoAsxZxMvppU/Hy4pPioUsKKf1q+ymCuyOsJLP4mShaerrOTPrSMR4wHtQkv5H7BrPdhGw8IP03X8hUgVToSm6YAD9yBDt7UOEyw1Frxdyb+2VaI32UvLrhSZsismi4ph0Tej93L34sC6DtCKikDW0nzn+gTWEfvItg3Aq6qOfSQAMfBk1G5DIKI/LWAIBVVvFELCAaY2qXBQ96xzB8yF/PTX3GAsCrXhtH2f5rcONgthiF6fH5tIlcLanUSlUzO7DiiQD7ojCdm5JWperxNVoGGfaAQdwz2nqPdK06g5fba3vf2I5Iix1rqAQDnLhOCzTMw== 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=9julfzi0G+JMJJYqCFRmgHdsy/+ZT++VVxWau0ySsYs=; b=VCU7XR3R4hIPyHZ0dkZUo/LNDd7QN3+mpZECktS9Vfqb3ojRflKEGejVaIEkhJ+mZssGfTDCnr8p8REY4c8Z7pnffOTN1O2I8dQFOTncBm54cFzvMZQzMJK8VJP1ooY0/w7eEW8OZ+FRjFPrWL84lG+MQ5sZyEhpIJKHjoHVZV9TMAQlGcWK3wuUtgSjOxaYvg2T9ptdG1rmHJ2UzWpY07gTYE7sLoIzJ9UJcdhJQfhAXB6KluVwvEzys1rKfGrkBEYmRJs1sQbIVkUj28lsZDpa5dtb+o3nOUsEP7Dcjijk6a0O6WOjB/30iJYAJNuLSgSvKPofFMESgFXRyuY8fA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from GVXPR04MB9831.eurprd04.prod.outlook.com (2603:10a6:150:11c::8) by AS8PR04MB7896.eurprd04.prod.outlook.com (2603:10a6:20b:2a2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.23; Tue, 1 Jul 2025 09:00:27 +0000 Received: from GVXPR04MB9831.eurprd04.prod.outlook.com ([fe80::4634:3d9c:c4a:641a]) by GVXPR04MB9831.eurprd04.prod.outlook.com ([fe80::4634:3d9c:c4a:641a%5]) with mapi id 15.20.8901.018; Tue, 1 Jul 2025 09:00:26 +0000 From: Antoine Bouyer To: libcamera-devel@lists.libcamera.org Cc: julien.vuillaumier@nxp.com, Antoine Bouyer , Laurent Pinchart Subject: [PATCH v4 1/2] pipeline: imx8-isi: Add constexpr for maximum pipeline and resize if needed Date: Tue, 1 Jul 2025 10:58:16 +0200 Message-Id: <20250701085818.2447600-2-antoine.bouyer@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250701085818.2447600-1-antoine.bouyer@nxp.com> References: <20250701085818.2447600-1-antoine.bouyer@nxp.com> X-ClientProxiedBy: FR4P281CA0220.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e4::15) To GVXPR04MB9831.eurprd04.prod.outlook.com (2603:10a6:150:11c::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GVXPR04MB9831:EE_|AS8PR04MB7896:EE_ X-MS-Office365-Filtering-Correlation-Id: ce28a2b7-b3c8-435d-f9d5-08ddb87db817 X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|366016|376014|19092799006|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: QmOMgiyna+69z+w9eZsXnbDFD1kjXu2Q32kzIhtijWP5faHkd58Kn8NGB5kwGt3nMTQ2DP1yRopLaDO+hxhkdLlcigWL2NursXtavV3VLfDiZF9MSDju/gDk/b8EqUAJV87qfaoeAHrkGAQvmdKqUKxfw3O50HXVPBUU0ExIFhQDGD/62A2EdJ8kBZQzsAXFrfAXZIpTqRCZLNIsQP1TyVL/qRQUwtGzX6FUbtMW+sWDfG5X8J+GkJbH/hEoNI3cwVM1dn7Wfkh+Oy8+WQRuIcFnfkYNN02sQ9DUPXBb2fJlF91nS9CexYaOyrXBDztkZLdYeGItimYDGnwVrKoT9PkF3+WwjliuaNvc6KIwzegIOAVNVb2bM1TPb7bSq3Jh2v0DXRoCsd4Yxvkp4WsqeWZKYr67nBesuTRkTesEIp1FuixxeuxKTjojH2SKOJcJyooNNCcp2LPcNWnU4g9XwR1O8o4y0Z1nFjZW+HpB0QPF2hqdj6D3ID1jdhjhLeXbprYkOcAq4EhynGkUGf8kkciXYlyk5yEAVN31JgNLN1XAjnLnjR48j6oc2KBUfg4H1vHFqbU1JhY+MTD/7omrrDfrfPbXbaq810mO48xBtsd36jxxBdRophh0Eesg3e2uLUnkPGZml8tgu3SZAIYXEknEhnE56i5jOtESGFtn6wzsqQCNChamSL84TGq/zcUgfxtWDUS05cNRo3TU/9Hk1iLY/bpMQxOnTQh7BB1mixh1OxI9dWWSGLqJZtajuPgNkB26F2eIj70/z3CViY8ZFXLZ0q9cTAqwKVH1MEKiPMm6FdQ27MHOlULmNuWGoY+nh0zLCs4YlrCfcy3r5QvImnPw5acg1+5QwC2PlQo9FBGaqo/ggzkhnudyxKQTLod6EikutVpgKvTGrmvyqHgKaOSN5O48LAIPjtvrKZa4sBus6liiuLx/jlc90zcbw6XATuJjPnQ6DmVOU7ID0xQ4NHfaLrDjbm1GtODVKthUAEvRLQPbWxPhxbYp9UWE5wJquU9jPSRVnzWjsEtSt08hCW2nbsbfI+yxPc37kdpT9HSvXmZss8nmx26vMdl597wOJ47tE1G6Y6oEhxgXa035t7LKTrvI+qR6LiI7t9Pi277fhYoFRoKb/MGRip+j/oV6NKIegm13ckhBnUjfXSMCk1OZ13FxvpqW5vO6PFeRJY5I5m1Dp5XpwZXN0PnwPoCHvH7M9KcWNNCnrOL1sQ13I82HHgUhdZhiU7hMbR9NZNCWY7SJ67jAUc7oQd16sN+cWbpUiijpB+M5haZIK6YGBh2DIZ97ZN24KJKEHOkkqdcL+P3BDlflMSP29eJCXFDw1HI6Mfa1Y8KX/GNTtB2R+6PaPe4pbTFGUsWtzVCAPIEzZesIgZ396B5vKVBMC16FkeGS5vCxb+yUrk6wHo+8JA/J6vsHgytoSaoBzCo594+DB/1D0APqgFqC2t9VIV0Colpp8GFqU3+z6plUneeQWw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:GVXPR04MB9831.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(366016)(376014)(19092799006)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 41hiVhSkUCgCLI3e6ZlUBMMmyflnlachFY62CRJYxE9kjfoYLDwvSp7qgConTuOkW2sqVvb2mBrhxN9dU5UOt8KqtW77aCRcMIZOblrmlzA7UO0Tu5jeNUoVzjoPpePckDHiPxQxA1YuxwWAlwhi3DZ/njF/FvEkwLelYHBz8lPhLN5pXR87O40VAMCQHhUYBCo58uDgBiITkzHLa5/dbLzVUlgMzEspj+gHiHFDbL6Oc/PJqfrYSAoWFKxDkuFQG3z6wlgSCCrCiSJMFVrxHnCArC6L+bEOQUkhBl8P/o0B5o6iHcDGuAZLe/+6tMlb0O+GfWLhpfYSekRiDlOi4HoX4/DxZBCRPSt0Yv4o1/NsMZqVc4aIJGTZrg0lrYNH0IXmo3MntXvt6Y1OZ+vqopRgSiTe+JTu8paYtRFQyPmZHY6yUQqQKH9Eed9cvLNeyjR2n+HOuc5VCjDrcWcDxWvszLV7dqra5Y8+JZIt84imBWIsoFQpgX3oWYE8HvXb1t7fbNINcmSFQacQQl4N2SNBPnR3k4FfNptaPFS67Q1DEo55cCXwZKT8N5zyHFfvTr4qevY9BT3txO2kcYpHOi6B3Ao/2bO7W2E6+SIyntHIfpW9BU6cVNJradjCfNB1xIZxtvAbriHCgr9m5wfFZ+vxkIbQOD6dll9fbTFjqXmHljvtTxlNZEjF15DC9/jV6K/w2yQEeyXg9xd711j7E6tvNiT0t0xGH4as90KH6Z7OrlUd05W0Nn4A8CWE63U0lDyqxmIkV2fkWXAc/6v44ZFKhOGcVG6Teppgy5OuDJsJUi6SvH06o3oyOYH9PvpiZQZMehnwTuDwqagWBszeich92HAljoPfPlY456o2cbY05AgwCtZCBXsw94dZMpu9tarzEgHDokJnWzEg/q5rxhFVP1q3m1Gwmw0YP8E/caNAS0mBw1VQqvdfy1n9BBOiky/VOwQjhASKGxt7/1vofMGwJIahNTMJjha2qDtAfrwCitYuKc4vUtF5iyH9jnUdBe9Z6IpqsYGYeU8YIYNK/rBFeumXCtDFQcbB0b2Rw+CTwrpatkQ8ZlA65PW5eKnmJwDFcmxT6nEilyx2jkUyuIXdFrRuPJJ1gjCPVcwoTtZJT5yd+1hxNimTwcaegbMj8nzRml1zbuVgjaM4alM/B+Rj3NkgM1iBXOK98UVQjS7yuXxYZBqdudohLVFzXcDXlX0FvwfWFhJAQFh4xFgt4CoP9kbynJk+wEhFKFoB5xJCK6elr/evgw/eqvWwdxHgClcIp4jy8AUG56ugmjWVWFnfqnk8RgzDcioHUV42fKGET2xjUEddGmAVCp/ksM3XWggHDd+VoxBMEj3xnpHhIn0Sy5g6G+ufBmquis6aOgpaDi9ZQ3ekV3p9eJKXrPnIC/v5+/caCk/70E0WKugQmMmFYrqVJq2KnRE6hfydSYETQmd6c5CajBSAB47jauNlqt/ecaExFfECweW1LQZ9GP5Eie87PujQ/FB7VSm3f/VtNbHx3oFHcFglkXApZcsTbcpd+t+telKYpnn981rduqCThKR3ancp8JplF1rnhRtF7at7f2Y1tD/j+nvQywNzhp9rMJ06T7Kxo5q9hODw1A== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce28a2b7-b3c8-435d-f9d5-08ddb87db817 X-MS-Exchange-CrossTenant-AuthSource: GVXPR04MB9831.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2025 09:00:25.7711 (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: idgxRgsGaEGy8FuUyr3bqj9EJTqJVDB4SaHenNM3gKCNtGbC139k9UNxR2xYeLu4O5CC+lOyRdXowSRva36epg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7896 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 Reviewed-by: Laurent Pinchart --- 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 f4014b95df45..4e632e852ebf 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(); @@ -1050,8 +1049,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);