From patchwork Mon Jun 30 15:01:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Bouyer X-Patchwork-Id: 23694 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 1C03CBDCBF for ; Mon, 30 Jun 2025 15:00:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B2A3A68E01; Mon, 30 Jun 2025 17:00:15 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="YZ+rQ5F2"; dkim-atps=neutral Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazlp170100001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c200::1]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 749ED68E01 for ; Mon, 30 Jun 2025 17:00:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=U1KfNCiGGAqxjJrImtdUfSDNetKG+/i14XZGxnO2UaJMCF+w/uc2SDLAfOrCccFp57H3vYi08m6ueAfNj2VXeXQhi4jrbOqML7RDSwZNSKoQlV/ABAZ8+s1Ic4YN0tRc+HZw6O8ctztu1sBsKWTwghpK/62RQZt+jdXUSMfc9ddjuJpZR/LJxj/fBvIMCT7+aNHdtGnJ2cb2+88zUHtQE92b7sr3lTHAWYzvOWlk+HXU84hUuzmMgSk3+k04IQZBPSr6LUNjWqRwnFVIFPNrkTdW3Fw5NpCcNyWUMjwux44WjLlTy5efh6R5Bwr7HAji/7kBGoZf0P9f+jGbOJFiIQ== 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=xobTcM1pCT949btYUQDzowzyvKYJoaR4ea6k4MmuAf0=; b=cF5rCAk34KUs4+3VqOw5jcQKB3uRxYseQ5HSeExVWmCkc6xQas/n9ode26U8sHLga3XItsObRImfebQ53Fceq8z1Vn/bQJRXULwURrKW+jTDeFlBQDnobfsjNj28iOxqIq3xUr8lq2Qg6ZkqZTdPWyfghvD9IlmvEWRPANthxcq295xwVvQkFVdwgBYJU3xa3VczOu2MbefLzs3JU3GuFuGMU+F53P48FFncbTZ/g225ML9RwKXn8oxwXS9LBP7X3+3lStDxNsjPDoyRzEoXdkIsoMYI2mbHhlVfFsfAw0ALCJNmcgATTgFpabSYd1d4LD/9MkadVtUhNqdrKH60gg== 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=xobTcM1pCT949btYUQDzowzyvKYJoaR4ea6k4MmuAf0=; b=YZ+rQ5F2F84V2/2ElNoxBkWacX3fjNs3GgY8ApoZjBGDXaqnwIJP8gPQuMZ+eZMZSuxigl65myUJrcdgeolpKxSHmToqpihkvriaEIh4DSlBONAnjcv4H1l/lN5Yy7+U46XklmybYRBAUXnb9jNwm/46I/gQkt9J9y6NTDLgKLo/BmcpNhdzB0G+TzUGjY/c7oqss6bA0qJPnblhFpMvbxB/7mhYjbHn/zyjw+KgxznM6jJ17+KGSfHuLOtmwmAUvn2T8uRixKlf5llkUn1CvmW1+/yoqy9D5ScaihKahraIfSbJ365fktn/2oqQL2G9zb77nR4Qf4He9iwIH7CEaA== 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 AS5PR04MB9856.eurprd04.prod.outlook.com (2603:10a6:20b:678::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.29; Mon, 30 Jun 2025 15:00:10 +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.8880.024; Mon, 30 Jun 2025 15:00:10 +0000 From: Antoine Bouyer To: libcamera-devel@lists.libcamera.org Cc: julien.vuillaumier@nxp.com, Antoine Bouyer , Laurent Pinchart Subject: [PATCH v3 1/2] pipeline: imx8-isi: Add constexpr for maximum pipeline and resize if needed Date: Mon, 30 Jun 2025 17:01:27 +0200 Message-Id: <20250630150128.2435445-2-antoine.bouyer@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250630150128.2435445-1-antoine.bouyer@nxp.com> References: <20250630150128.2435445-1-antoine.bouyer@nxp.com> X-ClientProxiedBy: AM0PR02CA0120.eurprd02.prod.outlook.com (2603:10a6:20b:28c::17) To GVXPR04MB9831.eurprd04.prod.outlook.com (2603:10a6:150:11c::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GVXPR04MB9831:EE_|AS5PR04MB9856:EE_ X-MS-Office365-Filtering-Correlation-Id: 2eeeaecf-7d17-4262-2a67-08ddb7e6cefb 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|366016|52116014|376014|19092799006|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: AlqE4nLqDdL3fCt+awl5LQi+XXvUQwyoSLrGg5DDqadxvR/9y8EisaGvglk+mtWjYg+wksl/GgB5T+KmZftUHH0tCV9qch4C2a/sY2661u8W70bQlipElzxLvnGkS6Bz8ZbAGdzcIiw3r6Rasq631A+2Rmhm8r/dNF7xKgaSbIClVRvugHrxNISu7BQJOQKIV5ZO3uDMHssUp9RnPQs/qX8Y2EeiQJnmXL5K9AQ9Tbrx1ZU8eKHyk4hbq7NuAPhUtjwxxbbddfHOnHOA8+Ck1IuNsZt92xokj2iup/tXOOgPLBlPtH8qAb4WnEsOcMiMXw6dyuryH0ZS6/amscYxTbilMx/i4vdVXYX1gxjCQ4xmg2SVmAx2vdudsoXNRgIwUYY3AP1Vi+lHY1MDWNsL0GTcOPKhI1j18718aVhwAsNQDZIizhqTkj68+Ra/zqM2FurjlSSXozhORttMEBeb+PjJ5A3knUbD7FAMJwxOei7Wbs3G0kUEKT5v+p89ATJgZfNuGGWNqpw9veu6eBOKLjsApEpVg8btfttLSRCQgHFW/lIaSusvwdWtZwF5kmhz+hdCWx2w4t4jIop13E/PcTaPjlNHYfFNm3+Czh6Y9mrnfLMVi660vZ2Onh3WDH120og4+Ui9DDRjAeolXqqbayz7yPnSMHktMMK4foFzgqCwMUa8mQrimTWAZgsfLnYxkyTwF5Jm4IzoIWK48Djfoo/TJDjoEodpB11bUKbRHdA47fSISn+hwlnyH0/0nU3EQ4bDWbhsBCbCmAVUtddhc2vjSYli8nPx5XWpq115pGQSLhi+5QAA3gOLsixr/9RWQYD/hjobdlo2pqi+/LBfTXPea5lZCK4ApO19KBiUI+J4k+m2PbG3pxdKmexNBD19PEHiW81ZqppbTO1vNYK4w/+llaRj+/RPm1u1d2LjEyonXcZ+YjjoARyHmcItReSINjbqPL/ELExKoJzlZRJJ/12cY84Q+iMq7bM6SL59Hd0Jw0YCvt83Lw3EZS4IK4t9/M6lrPUoA/AZBqSabc0+5a8XnbbteC0g8Xa5sEyg7dD3Ap6qX2CQdLxOOjARbZn2KTnR9qGzkVY7Kwxp+JhG9RjpIoT0EYVmoG2hNC33hTiFte0jNcjtJy92bOurQYu0DASX+yrxEmlm2PbcmEEPBvnrAHX/UHmsLMeT6tj8QvNkGSl6erU8RZg02GkNUCL1TzoeM1+rTGs0sGpLOkkRtNA/YT1AKCxKST4IPHJJ54oz7u/IiX0/AteEUiC97+3OrLX7UWU79jhHD4lma6lMPuSgDeDdLL7sETH+2vel0cCbAlyt9DVqmnOVSA37JZ+2ztiwLMPpBBodGmadssWI91w4AY7TdPqruUQ++CPpccYjNQvsO1JS2bLkynxb6pW7wrHMDXAe1WAjkGJRdWUcDXoF19RG+pzG+6X6kbx8/7Wm0g6JVO8TeBLBYCLm/B3f+W+W6elk9V5fdJY8wPimjg== 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)(366016)(52116014)(376014)(19092799006)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eUcW/BjeZi0g+VQdMASoPFiyhMguLY4FatjdEjlPBsQsK1/GanD4YRe2kUwsx2qUZctKIJn9zXHKN/oF3STSP+Ct0RNc7tJH/RsQvfwFQURwJ6UY6f1rehzrmyAYXoiiNEsYQgBwu+66NZm1yFsF4EPJ1xK+tcVe8y3husqKUjP2bcjTjC76mXpazCWx/mFWJGciy/hnq+U8BUpyy2cfESL1pg4PflCbZuDSG7Pxscnj7/2rY8Rkw6ak8CakJ3Ybnne+Izj3kWKTJGzlco7tpa/zMibLiycLncRlUsr8I+iWcJg/UXb8H5J5IToiEe6IvfQAk85fTlxC/2WTkcHjM/hhxGyiPoP77XEq9zwYx7OLnKkVBlHwK+b/0hkV1avFdlpZqLg1MeDk0/UuGc/hixYn88rge8VW7yd2q4TJUB0L9883cPC7qBVbolqqzds1UEim7ESmMpKFigOW60IVotzZ6X4tcR2Po1ugYgXgMv3F7dWg40zZQEQVgvYtiYmDQ9YyUY4qy/lECQyHHl/b25M7AUomyrGhIwveb0YXch4Nq4ANY/rrtP107rB2r9pnA6B2XXlbmKJ/vAGXP1CFWOkq3/3C+bmWxnnUe9EwWwl2muF1e/pg7My94ohztJdAdtsezW4CpYamJ9yXbSHeNNT2eJNGGwFtUv1YkbwnA0wwHJMFEDPSDpcv+0bz44Koxaa4kkcgdLDNiTy4o3BfLQWqzILbvtnttBLWSp/E/A15gZSOEp75C+nWHiZn30/QvXJJ7Z+uDRsEfTCijUTqalAbzGQ7apV50DkHaEfEeCCZ/NVgqg+X0GHbQE35afuFHX18dXlVA88m4AzRWXJ3pqb0uRTBTU+qLG4fYLoNTIoQYu8u+j1UzrZIFuEv89rvzFf/vJ75Vg3+lmCf1xAaHHvo/H38FBN8SdxP1H/cimRmJAtRmnFGI32cYmIzhjWZB+vnwfq3JI2U51MDrkRQevUzxiiamJv4qdI6zLMmFOfG4TiQq5lKGqy0R5Rhx8wxLyJZdbGHapAgYymbUldweYHlSDpfTnYJwQ3pqwY+OKGuFobs1Fy+UKSqtkeLig7B5lHMn3yfKQWSxg8n5V5SMksGSfI4gsamS7cUWDPb2MgkdJ1ZSr1/48jyGoS1UFFlBEnTWbs1ipoIE/8CmceGA6ODM0IjEITNNoFlps5byoAvn+0abiXkYf+n/ndqju7LsepJLUd9qvWs89hH48RoQG8OsbRYHM/Sp0suxaaRBwGaWJGDvYEDW0Kp2nzxK4v4DFAzV1UaQnQNaTvcZF9mXh5HQiFz0ProrL27yaWye68V3vNgl3r63ZbkxaXW2j0a6PH67Rf8wBHmeg6lfWIhmUewnxzkJAQ5thClbSy/VGE4oQRx4lTVTRiMxo4tCKZ0bJf8AtJL3RsdLSDTRitlVTvA5uKQaDNsTSFCiP2/3QmK4aayc+CGWaYIMwa0fxG39tOoLMA8bsnhRWv5BfYaA2zrO6qoMEOk30cqZut3RBwfJ53aT8cZGRPnns0MNUeiMq9Ap1gPHxKm4gomkwrhmFFaTJ1/e4zxkKicdnuyiBaWfpf7v+RzCDEjmGh4nBj634Qy2Z1z53fzHNeNBPGXQw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2eeeaecf-7d17-4262-2a67-08ddb7e6cefb X-MS-Exchange-CrossTenant-AuthSource: GVXPR04MB9831.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2025 15:00:10.0909 (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: IfNt1u5klU3wD9VrjgRmQKNuaLd5qUiQWLFQrPILG45sNLZILPGgMqyX0LoyvQJD74u6csqsBprDaq921kHmHw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9856 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 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);