[{"id":12834,"web_url":"https://patchwork.libcamera.org/comment/12834/","msgid":"<20200928224815.GW23539@pendragon.ideasonboard.com>","date":"2020-09-28T22:48:15","subject":"Re: [libcamera-devel] [PATCH v3 20/22] libcamera: pipeline: rkisp1:\n\tMove path link handling to RkISP1Path","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 Fri, Sep 25, 2020 at 03:42:05AM +0200, Niklas Söderlund wrote:\n> Move the path link handling to RkISP1Path, there is no functional\n> change.\n> \n> Signed-off-by: Niklas Söderlund \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 11 ++---------\n> src/libcamera/pipeline/rkisp1/rkisp1path.cpp | 6 +++++-\n> src/libcamera/pipeline/rkisp1/rkisp1path.h | 4 ++++\n> 3 files changed, 11 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 6158fbee41339c32..e41a9a51bda576b0 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -1015,20 +1015,13 @@ int PipelineHandlerRkISP1::initLinks(const Camera *camera,\n> \t}\n> \n> \tfor (const StreamConfiguration &cfg : config) {\n> -\t\tMediaLink *link;\n> \t\tif (cfg.stream() == &data->mainPathStream_)\n> -\t\t\tlink = media_->link(\"rkisp1_isp\", 2,\n> -\t\t\t\t\t \"rkisp1_resizer_mainpath\", 0);\n> +\t\t\tret = data->mainPath_->enable();\n> \t\telse if (cfg.stream() == &data->selfPathStream_)\n> -\t\t\tlink = media_->link(\"rkisp1_isp\", 2,\n> -\t\t\t\t\t \"rkisp1_resizer_selfpath\", 0);\n> +\t\t\tret = data->selfPath_->enable();\n> \t\telse\n> \t\t\treturn -EINVAL;\n> \n> -\t\tif (!link)\n> -\t\t\treturn -ENODEV;\n> -\n> -\t\tret = link->setEnabled(true);\n> \t\tif (ret < 0)\n> \t\t\treturn ret;\n> \t}\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\n> index b2dd669f4caf3269..8010cb92423c8269 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\n> @@ -22,7 +22,7 @@ RkISP1Path::RkISP1Path(const char *name, const std::vector &formats\n> \t\t const Size &minResolution, const Size &maxResolution)\n> \t: name_(name), running_(false), formats_(formats),\n> \t minResolution_(minResolution), maxResolution_(maxResolution),\n> -\t resizer_(nullptr), video_(nullptr)\n> +\t resizer_(nullptr), video_(nullptr), link_(nullptr)\n> {\n> }\n> \n> @@ -45,6 +45,10 @@ bool RkISP1Path::init(MediaDevice *media)\n> \tif (video_->open() < 0)\n> \t\treturn false;\n> \n> +\tlink_ = media->link(\"rkisp1_isp\", 2, resizer, 0);\n> +\tif (!link_)\n> +\t\treturn false;\n> +\n> \treturn true;\n> }\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.h b/src/libcamera/pipeline/rkisp1/rkisp1path.h\n> index 9c2ecb620375683b..f57f4b646c3a3164 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1path.h\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1path.h\n> @@ -12,6 +12,7 @@\n> #include \n> #include \n> \n> +#include \"libcamera/internal/media_object.h\"\n> #include \"libcamera/internal/v4l2_videodevice.h\"\n> \n> namespace libcamera {\n> @@ -32,6 +33,8 @@ public:\n> \n> \tbool init(MediaDevice *media);\n> \n> +\tint enable() { return link_->setEnabled(true); }\n> +\n> \tStreamConfiguration generateConfiguration(const Size &resolution);\n> \tCameraConfiguration::Status validate(StreamConfiguration *cfg);\n> \n> @@ -59,6 +62,7 @@ private:\n> \n> \tV4L2Subdevice *resizer_;\n> \tV4L2VideoDevice *video_;\n> +\tMediaLink *link_;\n> };\n> \n> class RkISP1MainPath : public RkISP1Path","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 3501DC3B5B\n\tfor ;\n\tMon, 28 Sep 2020 22:48:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C20A6603ED;\n\tTue, 29 Sep 2020 00:48:51 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1EE3F60394\n\tfor ;\n\tTue, 29 Sep 2020 00:48:50 +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 A8D35A58;\n\tTue, 29 Sep 2020 00:48:49 +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=\"eIJBzw5H\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601333329;\n\tbh=W0Kh08eZV9qWwFg8xqS3X2yp1XQgqbU1sx0aiYPyC4k=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=eIJBzw5Hrwa8yCzT984oAggGHvz7ncGS4hesmPQnbmOw9lCwAakR4Itdqzxm26Vhn\n\tRMGdeGzcvJ4ZHGx8hhYwv5RrAQ+FJCBaHMp1TP4/olMiBBEp2oWs1boHf47K2rbiir\n\t8ZfCJLg8D6Ii+m0mG+xCO8nCCu47PZ41qpdV8ASQ=","Date":"Tue, 29 Sep 2020 01:48:15 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Message-ID":"<20200928224815.GW23539@pendragon.ideasonboard.com>","References":"<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>\n\t<20200925014207.1455796-21-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200925014207.1455796-21-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH v3 20/22] libcamera: pipeline: rkisp1:\n\tMove path link handling to RkISP1Path","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\" "}}]