From patchwork Fri Nov 26 15:35:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 14810 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 C4652BF415 for ; Fri, 26 Nov 2021 15:35:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id CAC9060543; Fri, 26 Nov 2021 16:35:46 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="bE9KgCj9"; dkim-atps=neutral Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C01C16011E for ; Fri, 26 Nov 2021 16:35:44 +0100 (CET) Received: by mail-wm1-x32d.google.com with SMTP id p27-20020a05600c1d9b00b0033bf8532855so7061455wms.3 for ; Fri, 26 Nov 2021 07:35:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tAd/+FWYTaYdnufy3EhXNrXYjVtOl7fyDxFM3h6YwaA=; b=bE9KgCj9WS9qM5x5MQdHimkwp2b/jVaxX/XF/vAiU+up2TYd04NDL7eEPNy7bz/27U pfZFcvU/tCyitfblaU8+r8yESsFc+aUE1kXNmx+VuNzSOexsXg4ju6p4jTNUZiZIdzZx pTJvxugzj5ijtbg/U1sNDxNeRTDTlRpya2LHQvlrFJ0PunrqyZhzmvAOD8g6pPclFQbL 8P7PhUAtO4cUQN+cs3X4pN4bBSYyFwYBqff5GOwmN/qZvJfKP4u6brFgnqRhqZqhBa+r K2v2YuadGkSzgl9BDzbU8VHbieIC25Wh9XDnBf0qQGqthPuGeqSxm4Jlcb84iMcK0lKS XEBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tAd/+FWYTaYdnufy3EhXNrXYjVtOl7fyDxFM3h6YwaA=; b=zUN4EXaa7N0JhxmC7bHVL0/PMgQnXExv+4DhRhKAWQXCt6dsK6zSy3YRmbo+/0osb4 rToZb1SoQ2dNv1blN5Q5HrZ+pKFfeUY1bjGdXjNjHsqFQR28J9V5JYpwivbcw0BURJ4H ku3DQ75I7B/7YNTwtqcyERHGqdz2BvFspUnlcpTsTZ0h7x4V6t73OZwQxOwJTJsMCVk8 wKN/9gUYypIA3iWFsX/n99tatCv1R/Ws2zLW+W3b/Tk1ZJt/IMAVZjzKyxRiANuACQGQ ZEkK9Xw9PmXqoBnRfGb8T5Np43Y9MWhyx+Jiy3NK37qNV2yu+PHj0hstngT2s38MYkQk yJMA== X-Gm-Message-State: AOAM530LV00NjK76MdPNt67ZMvwWB/XG3m/YhJRSiiHLD9r+33lSBF36 h1g7Q8HJT7W4yTDMBIUT815qLAZdfoFh51zE X-Google-Smtp-Source: ABdhPJxPtzomvQuWWLRFIJX3yzxEbMtqTwqf2PFQdBqsdMkwazVwDGp6pLJR9VvYl6RsZiCH6LWPWA== X-Received: by 2002:a1c:9d03:: with SMTP id g3mr15716526wme.143.1637940944130; Fri, 26 Nov 2021 07:35:44 -0800 (PST) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:89da:d0c:9f56:bbfc]) by smtp.gmail.com with ESMTPSA id p14sm10591272wms.29.2021.11.26.07.35.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Nov 2021 07:35:43 -0800 (PST) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 26 Nov 2021 15:35:37 +0000 Message-Id: <20211126153538.2594702-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 1/2] pipeline: raspberrypi: Split out device enumeration and camera registration 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" Split out PipelineHandlerRPi::match() so that media device enumeration and acquisition is separated from camera registration. The former logic remains in PipelineHandlerRPi::match(), whereas the latter logic is moved into a new PipelineHandlerRPi::registerCamera() member function. Signed-off-by: Naushir Patuck Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index ad526a8be6a2..5a6dfa4e8b2a 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -314,6 +314,7 @@ private: return static_cast(camera->_d()); } + bool registerCamera(); int queueAllBuffers(Camera *camera); int prepareBuffers(Camera *camera); void freeBuffers(Camera *camera); @@ -1013,6 +1014,11 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator) if (!isp_) return false; + return registerCamera(); +} + +bool PipelineHandlerRPi::registerCamera() +{ std::unique_ptr data = std::make_unique(this); if (!data->dmaHeap_.isValid()) return false; @@ -1173,7 +1179,7 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator) const std::string &id = data->sensor_->id(); std::shared_ptr camera = Camera::create(std::move(data), id, streams); - registerCamera(std::move(camera)); + PipelineHandler::registerCamera(std::move(camera)); return true; }