[{"id":12511,"web_url":"https://patchwork.libcamera.org/comment/12511/","msgid":"<20200915005033.GV15543@pendragon.ideasonboard.com>","date":"2020-09-15T00:50:33","subject":"Re: [libcamera-devel] [PATCH v2 09/13] libcamera: pipeline: rkisp1:\n\tAdd self path devices","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Mon, Sep 14, 2020 at 04:21:45PM +0200, Niklas Söderlund wrote:\n> Add the V4L2 device nodes needed to operate the self path.\n> \n> Signed-off-by: Niklas Söderlund \n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 26 ++++++++++++++++++++----\n> 1 file changed, 22 insertions(+), 4 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 4e1295486c184178..5aa01f87afd71183 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -131,9 +131,11 @@ public:\n> class RkISP1CameraData : public CameraData\n> {\n> public:\n> -\tRkISP1CameraData(PipelineHandler *pipe, V4L2VideoDevice *video)\n> +\tRkISP1CameraData(PipelineHandler *pipe, V4L2VideoDevice *mainPathVideo,\n> +\t\t\t V4L2VideoDevice *selfPathVideo)\n> \t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n> -\t\t frameInfo_(pipe), mainPathVideo_(video)\n> +\t\t frameInfo_(pipe), mainPathVideo_(mainPathVideo),\n> +\t\t selfPathVideo_(selfPathVideo)\n> \t{\n> \t}\n> \n> @@ -152,6 +154,7 @@ public:\n> \tRkISP1Timeline timeline_;\n> \n> \tV4L2VideoDevice *mainPathVideo_;\n> +\tV4L2VideoDevice *selfPathVideo_;\n> \n> private:\n> \tvoid queueFrameAction(unsigned int frame,\n> @@ -228,7 +231,9 @@ private:\n> \tMediaDevice *media_;\n> \tV4L2Subdevice *isp_;\n> \tV4L2Subdevice *mainPathResizer_;\n> +\tV4L2Subdevice *selfPathResizer_;\n> \tV4L2VideoDevice *mainPathVideo_;\n> +\tV4L2VideoDevice *selfPathVideo_;\n> \tV4L2VideoDevice *param_;\n> \tV4L2VideoDevice *stat_;\n> \n> @@ -561,7 +566,8 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n> \n> PipelineHandlerRkISP1::PipelineHandlerRkISP1(CameraManager *manager)\n> \t: PipelineHandler(manager), isp_(nullptr), mainPathResizer_(nullptr),\n> -\t mainPathVideo_(nullptr), param_(nullptr), stat_(nullptr)\n> +\t selfPathResizer_(nullptr), mainPathVideo_(nullptr),\n> +\t selfPathVideo_(nullptr), param_(nullptr), stat_(nullptr)\n> {\n> }\n> \n> @@ -570,7 +576,9 @@ PipelineHandlerRkISP1::~PipelineHandlerRkISP1()\n> \tdelete param_;\n> \tdelete stat_;\n> \tdelete mainPathVideo_;\n> +\tdelete selfPathVideo_;\n> \tdelete mainPathResizer_;\n> +\tdelete selfPathResizer_;\n> \tdelete isp_;\n\nNot a candidate for this series, but should we use std::unique_ptr<> ?\n\nWith the same assumption as for patch 08/13,\n\nReviewed-by: Laurent Pinchart \n\n> }\n> \n> @@ -975,7 +983,8 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n> \tint ret;\n> \n> \tstd::unique_ptr data =\n> -\t\tstd::make_unique(this, mainPathVideo_);\n> +\t\tstd::make_unique(this, mainPathVideo_,\n> +\t\t\t\t\t\t selfPathVideo_);\n> \n> \tControlInfoMap::Map ctrls;\n> \tctrls.emplace(std::piecewise_construct,\n> @@ -1030,11 +1039,19 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n> \tif (mainPathResizer_->open() < 0)\n> \t\treturn false;\n> \n> +\tselfPathResizer_ = V4L2Subdevice::fromEntityName(media_, \"rkisp1_resizer_selfpath\");\n> +\tif (selfPathResizer_->open() < 0)\n> +\t\treturn false;\n> +\n> \t/* Locate and open the capture video node. */\n> \tmainPathVideo_ = V4L2VideoDevice::fromEntityName(media_, \"rkisp1_mainpath\");\n> \tif (mainPathVideo_->open() < 0)\n> \t\treturn false;\n> \n> +\tselfPathVideo_ = V4L2VideoDevice::fromEntityName(media_, \"rkisp1_selfpath\");\n> +\tif (selfPathVideo_->open() < 0)\n> +\t\treturn false;\n> +\n> \tstat_ = V4L2VideoDevice::fromEntityName(media_, \"rkisp1_stats\");\n> \tif (stat_->open() < 0)\n> \t\treturn false;\n> @@ -1044,6 +1061,7 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n> \t\treturn false;\n> \n> \tmainPathVideo_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady);\n> +\tselfPathVideo_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady);\n> \tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n> \tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n>","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 DDF3EBF01C\n\tfor ;\n\tTue, 15 Sep 2020 00:51:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4F00062DAB;\n\tTue, 15 Sep 2020 02:51:05 +0200 (CEST)","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 685C462901\n\tfor ;\n\tTue, 15 Sep 2020 02:51:04 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4C2AC275;\n\tTue, 15 Sep 2020 02:51:01 +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=\"ueU1W+wa\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600131063;\n\tbh=arDMyf+cXEOMte8QLrgsRpb4/DDApoVIHbW8useeNvg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ueU1W+waWEM7PNvaCbhCotWXvTbZWNNW2mejRmRX5uGMj6WDkoZId/zZ220XR/3Po\n\t4+OcCqmSPLLYwmvqRp9mYwfpnjWOeaeaNxcVsj0uV/2GOjighiCszN37n8Ldk+z5Fv\n\tWUj+GO+0gMMyCfzsqBCirTTX8RDNIHlfdqMW6fE0=","Date":"Tue, 15 Sep 2020 03:50:33 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Message-ID":"<20200915005033.GV15543@pendragon.ideasonboard.com>","References":"<20200914142149.63857-1-niklas.soderlund@ragnatech.se>\n\t<20200914142149.63857-10-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200914142149.63857-10-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH v2 09/13] libcamera: pipeline: rkisp1:\n\tAdd self path devices","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=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]