[{"id":21309,"web_url":"https://patchwork.libcamera.org/comment/21309/","msgid":"<163818412737.3059017.7493405047568420664@Monstersaurus>","date":"2021-11-29T11:08:47","subject":"Re: [libcamera-devel] [PATCH v4 1/2] pipeline: raspberrypi: Split\n\tout device enumeration and camera registration","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Naushir Patuck (2021-11-26 15:35:37)\n> Split out PipelineHandlerRPi::match() so that media device enumeration and\n> acquisition is separated from camera registration. The former logic remains\n> in PipelineHandlerRPi::match(), whereas the latter logic is moved into a new\n> PipelineHandlerRPi::registerCamera() member function.\n> \n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 8 +++++++-\n>  1 file changed, 7 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index ad526a8be6a2..5a6dfa4e8b2a 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -314,6 +314,7 @@ private:\n>                 return static_cast<RPiCameraData *>(camera->_d());\n>         }\n>  \n> +       bool registerCamera();\n>         int queueAllBuffers(Camera *camera);\n>         int prepareBuffers(Camera *camera);\n>         void freeBuffers(Camera *camera);\n> @@ -1013,6 +1014,11 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n>         if (!isp_)\n>                 return false;\n>  \n> +       return registerCamera();\n> +}\n> +\n> +bool PipelineHandlerRPi::registerCamera()\n> +{\n>         std::unique_ptr<RPiCameraData> data = std::make_unique<RPiCameraData>(this);\n>         if (!data->dmaHeap_.isValid())\n>                 return false;\n> @@ -1173,7 +1179,7 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n>         const std::string &id = data->sensor_->id();\n>         std::shared_ptr<Camera> camera =\n>                 Camera::create(std::move(data), id, streams);\n> -       registerCamera(std::move(camera));\n> +       PipelineHandler::registerCamera(std::move(camera));\n>  \n>         return true;\n>  }\n> -- \n> 2.25.1\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 66507BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 29 Nov 2021 11:08:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BFE796011C;\n\tMon, 29 Nov 2021 12:08:51 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1F7C86011C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 29 Nov 2021 12:08:50 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A9EFE2A5;\n\tMon, 29 Nov 2021 12:08:49 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"vyCun1XT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638184129;\n\tbh=bBqgHTiTXY7FcwxdLCBCDsy7GGxpd0Hom8c0CuYOIBM=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=vyCun1XTo4of/t2VNDTrmhUPQB72/1VCdqtRsg1PokyHcS606ncneup0e7iCgN+BC\n\tnKbG8xutcYL4Qzgx4Cg7WNj1grQgB18Xu3ZKrt+W1strmxZBdKRMUUZBTq/lXd/uDt\n\tKgadkGCCf+4tL7Fp6P2P/OiCXKSRV2g+sUmNr9jk=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20211126153538.2594702-1-naush@raspberrypi.com>","References":"<20211126153538.2594702-1-naush@raspberrypi.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","To":"Naushir Patuck <naush@raspberrypi.com>,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 29 Nov 2021 11:08:47 +0000","Message-ID":"<163818412737.3059017.7493405047568420664@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v4 1/2] pipeline: raspberrypi: Split\n\tout device enumeration and camera registration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]