From patchwork Tue Jul 4 22:57:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 18785 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 BFEABC3240 for ; Tue, 4 Jul 2023 22:58:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6E899628BD; Wed, 5 Jul 2023 00:58:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1688511529; bh=kV4tfNggj3HKOynGd/A+ySk8XG12Kz098H+dD3UmRJw=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=cxj1QlEJL/pCnSGJF1l6uqwMjk3x80NAmihlM1Td9Q3uzBSPHIbpQRyYRoRDNQH2J MLhShU0BqIBYZMUOt1bEX8UbgC92JL8r398RVMa5aN+rzrCnqgolcaS0x3pUyg9e6l seEgmENYEPHgr4gelLk0nY0j4phPFhtkjQ8ZDPAdzrQaY2wCQVMUSXVo9dGZL+iqxm uGb4OR/6jjGjXmCfBfzSROo4DDczx/rZnbEoj+CMsFt2egozib6RNbArMfA3blFG5w 4jMcQVROfj0eehuy50imwEDa1CadN/C7ek1JFXwl+NBL/d5qYvDhpHYQS97fowi73P gkgFYj+TWrqJw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E6B99628BB for ; Wed, 5 Jul 2023 00:58:46 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MStTEzH/"; dkim-atps=neutral Received: from Monstersaurus.local (aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net [82.37.23.78]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 37A0C1B6D; Wed, 5 Jul 2023 00:58:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1688511482; bh=kV4tfNggj3HKOynGd/A+ySk8XG12Kz098H+dD3UmRJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MStTEzH/rKEjSX7IeEPo6fJaO5DSeWe11EzBeG1FReRMCcijMJPMTx80+ALnWSeKi s0uuDDrOUarn505yMprmdDXHoW8p1BWYKIdiDVc3unt5Q38+jDkkp2fG8Nd5eads+/ 1rL6Elpj/X05GJIMVSWHpoi7cnAKh16aw8KKhoTE= To: libcamera devel Date: Tue, 4 Jul 2023 23:57:45 +0100 Message-Id: <20230704225746.3838484-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230704225746.3838484-1-kieran.bingham@ideasonboard.com> References: <20230704225746.3838484-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/2] v4l2: Use SystemDevices properties to identify cameras 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: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The CameraManager->get(dev_t) helper was implemented only to support the V4L2 Adaptation layer, and has been deprecated now that a new camera property - SystemDevices has been introduced. Rework the implementation of getCameraIndex() to use the SystemDevices property and remove reliance on the now deprecated call. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/v4l2/v4l2_compat_manager.cpp | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index 0f7575c54b22..948dadad646d 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -24,6 +24,7 @@ #include #include +#include #include "v4l2_camera_file.h" @@ -113,14 +114,32 @@ int V4L2CompatManager::getCameraIndex(int fd) if (ret < 0) return -1; - std::shared_ptr target = cm_->get(statbuf.st_rdev); - if (!target) - return -1; + const dev_t devnum = statbuf.st_rdev; + /* + * Iterate each known camera and identify if it reports this nodes + * device number in its list of SystemDevices. + */ auto cameras = cm_->cameras(); for (auto [index, camera] : utils::enumerate(cameras)) { - if (camera == target) - return index; + Span devices = camera->properties() + .get(properties::SystemDevices) + .value_or(Span{}); + + /* + * While there may be multiple Cameras that could reference the + * same device node, we take a first match as a best effort for + * now. + * + * \todo Consider reworking the V4L2 adaptation layer to stop + * trying to map video nodes directly to a camera and instead + * hide all devices that may be used by libcamera and expose a + * consistent 1:1 mapping with each Camera instance. + */ + for (const int64_t dev : devices) { + if (dev == static_cast(devnum)) + return index; + } } return -1;