{"id":9293,"url":"https://patchwork.libcamera.org/api/patches/9293/?format=json","web_url":"https://patchwork.libcamera.org/patch/9293/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200813005246.3265807-4-niklas.soderlund@ragnatech.se>","date":"2020-08-13T00:52:36","name":"[libcamera-devel,03/13] libcamera: pipeline: rkisp1: Setup links as part of configuration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"32887d436dfd5d99bfae9fc49f71f96bd0fbfb76","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9293/mbox/","series":[{"id":1215,"url":"https://patchwork.libcamera.org/api/series/1215/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1215","date":"2020-08-13T00:52:33","name":"libcamera: pipeline: rkisp1: Extend to support two streams","version":1,"mbox":"https://patchwork.libcamera.org/series/1215/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9293/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9293/checks/","tags":{},"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 7C997BD87D\n\tfor ;\n\tThu, 13 Aug 2020 00:53:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8FB97613A1;\n\tThu, 13 Aug 2020 02:53:42 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1DA85612F7\n\tfor ;\n\tThu, 13 Aug 2020 02:53:39 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 6bea8646-dcff-11ea-92dc-005056917a89;\n\tThu, 13 Aug 2020 02:53:37 +0200 (CEST)"],"X-Halon-ID":"6bea8646-dcff-11ea-92dc-005056917a89","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 13 Aug 2020 02:52:36 +0200","Message-Id":"<20200813005246.3265807-4-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200813005246.3265807-1-niklas.soderlund@ragnatech.se>","References":"<20200813005246.3265807-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 03/13] libcamera: pipeline: rkisp1: Setup\n\tlinks as part of configuration","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In preparation of supporting both the main and self path move all link\nsetup to be part of the configuration step. The main path is still the\nonly possible path.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 79 +++++++++++++-----------\n 1 file changed, 42 insertions(+), 37 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex a0e36a44d8d91260..38382a6894dac22a 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -211,7 +211,8 @@ private:\n \tfriend RkISP1CameraData;\n \tfriend RkISP1Frames;\n \n-\tint initLinks();\n+\tint initLinks(const Camera *camera,\n+\t\t const RkISP1CameraConfiguration &config);\n \tint createCamera(MediaEntity *sensor);\n \tvoid tryCompleteRequest(Request *request);\n \tvoid bufferReady(FrameBuffer *buffer);\n@@ -601,28 +602,9 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \tCameraSensor *sensor = data->sensor_;\n \tint ret;\n \n-\t/*\n-\t * Configure the sensor links: enable the link corresponding to this\n-\t * camera and disable all the other sensor links.\n-\t */\n-\tconst MediaPad *pad = isp_->entity()->getPadByIndex(0);\n-\n-\tfor (MediaLink *link : pad->links()) {\n-\t\tbool enable = link->source()->entity() == sensor->entity();\n-\n-\t\tif (!!(link->flags() & MEDIA_LNK_FL_ENABLED) == enable)\n-\t\t\tcontinue;\n-\n-\t\tLOG(RkISP1, Debug)\n-\t\t\t<< (enable ? \"Enabling\" : \"Disabling\")\n-\t\t\t<< \" link from sensor '\"\n-\t\t\t<< link->source()->entity()->name()\n-\t\t\t<< \"' to ISP\";\n-\n-\t\tret = link->setEnabled(enable);\n-\t\tif (ret < 0)\n-\t\t\treturn ret;\n-\t}\n+\tret = initLinks(camera, *config);\n+\tif (ret)\n+\t\treturn ret;\n \n \t/*\n \t * Configure the format on the sensor output and propagate it through\n@@ -924,22 +906,51 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request)\n * Match and Setup\n */\n \n-int PipelineHandlerRkISP1::initLinks()\n+int PipelineHandlerRkISP1::initLinks(const Camera *camera,\n+\t\t\t\t const RkISP1CameraConfiguration &config)\n {\n-\tMediaLink *link;\n+\tconst RkISP1CameraData *data = cameraData(camera);\n+\tconst CameraSensor *sensor = data->sensor_;\n \tint ret;\n \n \tret = media_->disableLinks();\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tlink = media_->link(\"rkisp1_isp\", 2, \"rkisp1_resizer_mainpath\", 0);\n-\tif (!link)\n-\t\treturn -ENODEV;\n+\t/*\n+\t * Configure the sensor links: enable the link corresponding to this\n+\t * camera.\n+\t */\n+\tconst MediaPad *pad = isp_->entity()->getPadByIndex(0);\n+\tfor (MediaLink *link : pad->links()) {\n+\t\tif (link->source()->entity() != sensor->entity())\n+\t\t\tcontinue;\n \n-\tret = link->setEnabled(true);\n-\tif (ret < 0)\n-\t\treturn ret;\n+\t\tLOG(RkISP1, Debug)\n+\t\t\t<< \"Enabling link from sensor '\"\n+\t\t\t<< link->source()->entity()->name()\n+\t\t\t<< \"' to ISP\";\n+\n+\t\tret = link->setEnabled(true);\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\t}\n+\n+\tfor (const StreamConfiguration &cfg : config) {\n+\t\tstd::string resizer;\n+\t\tif (cfg.stream() == &data->stream_)\n+\t\t\tresizer = \"rkisp1_resizer_mainpath\";\n+\t\telse\n+\t\t\treturn -EINVAL;\n+\n+\t\tMediaLink *link = media_->link(\"rkisp1_isp\", 2, resizer, 0);\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 \n \treturn 0;\n }\n@@ -1021,12 +1032,6 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n \tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n \n-\t/* Configure default links. */\n-\tif (initLinks() < 0) {\n-\t\tLOG(RkISP1, Error) << \"Failed to setup links\";\n-\t\treturn false;\n-\t}\n-\n \t/*\n \t * Enumerate all sensors connected to the ISP and create one\n \t * camera instance for each of them.\n","prefixes":["libcamera-devel","03/13"]}