[{"id":11175,"web_url":"https://patchwork.libcamera.org/comment/11175/","msgid":"<20200704211809.GB10773@pendragon.ideasonboard.com>","date":"2020-07-04T21:18:09","subject":"Re: [libcamera-devel] [PATCH v3 12/22] libcamera: pipeline:\n\traspberrypi: Acquire media devices with acquireMediaDevice","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Sat, Jul 04, 2020 at 10:31:30PM +0900, Paul Elder wrote:\n> Media devices should be acquired by pipeline handlers via\n> PipelineHandler::acquireMediaDevice so that the media devices can be\n> registered in the pipeline handler so that they can be automatically\n> added to the devnum map for the v4l2 compatibility layer to use. Make\n> the raspberrypi pipeline handler do this.\n> \n> Signed-off-by: Paul Elder \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> No change in v3\n> ---\n> .../pipeline/raspberrypi/raspberrypi.cpp | 21 ++++---------------\n> 1 file changed, 4 insertions(+), 17 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 1c0000b..cbb6f1c 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -374,7 +374,6 @@ class PipelineHandlerRPi : public PipelineHandler\n> {\n> public:\n> \tPipelineHandlerRPi(CameraManager *manager);\n> -\t~PipelineHandlerRPi();\n> \n> \tCameraConfiguration *generateConfiguration(Camera *camera, const StreamRoles &roles) override;\n> \tint configure(Camera *camera, CameraConfiguration *config) override;\n> @@ -401,8 +400,8 @@ private:\n> \tint prepareBuffers(Camera *camera);\n> \tvoid freeBuffers(Camera *camera);\n> \n> -\tstd::shared_ptr unicam_;\n> -\tstd::shared_ptr isp_;\n> +\tMediaDevice *unicam_;\n> +\tMediaDevice *isp_;\n> };\n> \n> RPiCameraConfiguration::RPiCameraConfiguration(const RPiCameraData *data)\n> @@ -502,15 +501,6 @@ PipelineHandlerRPi::PipelineHandlerRPi(CameraManager *manager)\n> {\n> }\n> \n> -PipelineHandlerRPi::~PipelineHandlerRPi()\n> -{\n> -\tif (unicam_)\n> -\t\tunicam_->release();\n> -\n> -\tif (isp_)\n> -\t\tisp_->release();\n> -}\n> -\n> CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n> \t\t\t\t\t\t\t const StreamRoles &roles)\n> {\n> @@ -895,17 +885,14 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n> \tisp.add(\"bcm2835-isp0-capture2\"); /* Output 1 */\n> \tisp.add(\"bcm2835-isp0-capture3\"); /* Stats */\n> \n> -\tunicam_ = enumerator->search(unicam);\n> +\tunicam_ = acquireMediaDevice(enumerator, unicam);\n> \tif (!unicam_)\n> \t\treturn false;\n> \n> -\tisp_ = enumerator->search(isp);\n> +\tisp_ = acquireMediaDevice(enumerator, isp);\n> \tif (!isp_)\n> \t\treturn false;\n> \n> -\tunicam_->acquire();\n> -\tisp_->acquire();\n> -\n> \tstd::unique_ptr data = std::make_unique(this);\n> \n> \t/* Locate and open the unicam video streams. */","headers":{"Return-Path":"","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 95FCABD790\n\tfor ;\n\tSat, 4 Jul 2020 21:18:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2533C60E01;\n\tSat, 4 Jul 2020 23:18:15 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5126D609C7\n\tfor ;\n\tSat, 4 Jul 2020 23:18:14 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BC278296;\n\tSat, 4 Jul 2020 23:18:13 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"P5qZSG8g\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593897493;\n\tbh=nD7Vn1PmJCQwZtRxcP5wl6vGk3ZS1tfbd9PVxH1v3gk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=P5qZSG8gNH0fYT20p+HI4sQBmPKUhd66FEy0MPT1uYWh28Fh5EbPIh8owCpa8zq8A\n\tflGuyLWSiz29j3O+44RtnIQ3CceFCXM5+2EzfdKQihN4oQiF2F3nDwCXQyaxSCM3+d\n\tY9zeiTWleuzXCal9AzEw4dJMx/RfMA3I2IeNspa0=","Date":"Sun, 5 Jul 2020 00:18:09 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"<20200704211809.GB10773@pendragon.ideasonboard.com>","References":"<20200704133140.1738660-1-paul.elder@ideasonboard.com>\n\t<20200704133140.1738660-13-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200704133140.1738660-13-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 12/22] libcamera: pipeline:\n\traspberrypi: Acquire media devices with acquireMediaDevice","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]