{"id":15211,"url":"https://patchwork.libcamera.org/api/1.1/patches/15211/?format=json","web_url":"https://patchwork.libcamera.org/patch/15211/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20211223022425.11927-1-laurent.pinchart@ideasonboard.com>","date":"2021-12-23T02:24:25","name":"[libcamera-devel] libcamera: pipeline: simple: Rename Entity::link to sourceLink","commit_ref":"22b61a4f3054089090f62cb8acaa6b96aae79903","pull_url":null,"state":"accepted","archived":false,"hash":"b8d1d532530db0fc23f92f1e0a47e4d79512f577","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15211/mbox/","series":[{"id":2862,"url":"https://patchwork.libcamera.org/api/1.1/series/2862/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2862","date":"2021-12-23T02:24:25","name":"[libcamera-devel] libcamera: pipeline: simple: Rename Entity::link to sourceLink","version":1,"mbox":"https://patchwork.libcamera.org/series/2862/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15211/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15211/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 7283BBF415\n\tfor ;\n\tThu, 23 Dec 2021 02:24:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9220160903;\n\tThu, 23 Dec 2021 03:24:35 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1DBC8605A8\n\tfor ;\n\tThu, 23 Dec 2021 03:24:34 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 979E72C5\n\tfor ;\n\tThu, 23 Dec 2021 03:24:33 +0100 (CET)"],"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=\"JWwN18Hj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1640226273;\n\tbh=Ls8z7lz98gG3hjjV4W08Q5bYHvq9FwaxUJKMXmS0pLE=;\n\th=From:To:Subject:Date:From;\n\tb=JWwN18HjcwuaCEIaS8wpm/46wfHMLix3RUtYLXm18OrKHD/utiRr8yaXd9T1wGBH4\n\toztkpepfpZg/giC7ImHP0C1vMc583K+yzaap9uL7sPpf3ReR4BPQ4bpHnf6hcJob5b\n\tT0CanZQe/427tCaiIKQS1B5Pck0RwixHrKtSvCLI=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 23 Dec 2021 04:24:25 +0200","Message-Id":"<20211223022425.11927-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: pipeline: simple: Rename\n\tEntity::link to sourceLink","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Entity::link member has an ambiguous name. Rename it to sourceLink\nto clarify that it stores the link on the source pad.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/pipeline/simple/simple.cpp | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)\n\n\nbase-commit: 8ff5a8d548eee7c2cb14b355867debdb29e75419","diff":"diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 8aa36306952b..ece821bfe978 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -202,10 +202,10 @@ public:\n \t\t */\n \t\tconst MediaPad *source;\n \t\t/*\n-\t\t * The link to the downstream entity, null for the video node at\n-\t\t * the end of the pipeline.\n+\t\t * The link on the source pad, to the downstream entity, null\n+\t\t * for the video node at the end of the pipeline.\n \t\t */\n-\t\tMediaLink *link;\n+\t\tMediaLink *sourceLink;\n \t};\n \n \tstruct Configuration {\n@@ -537,13 +537,13 @@ int SimpleCameraData::setupLinks()\n \t * want to enable) before enabling the pipeline link.\n \t */\n \tfor (SimpleCameraData::Entity &e : entities_) {\n-\t\tif (!e.link)\n+\t\tif (!e.sourceLink)\n \t\t\tbreak;\n \n-\t\tMediaEntity *remote = e.link->sink()->entity();\n+\t\tMediaEntity *remote = e.sourceLink->sink()->entity();\n \t\tfor (MediaPad *pad : remote->pads()) {\n \t\t\tfor (MediaLink *link : pad->links()) {\n-\t\t\t\tif (link == e.link)\n+\t\t\t\tif (link == e.sourceLink)\n \t\t\t\t\tcontinue;\n \n \t\t\t\tif ((link->flags() & MEDIA_LNK_FL_ENABLED) &&\n@@ -555,8 +555,8 @@ int SimpleCameraData::setupLinks()\n \t\t\t}\n \t\t}\n \n-\t\tif (!(e.link->flags() & MEDIA_LNK_FL_ENABLED)) {\n-\t\t\tret = e.link->setEnabled(true);\n+\t\tif (!(e.sourceLink->flags() & MEDIA_LNK_FL_ENABLED)) {\n+\t\t\tret = e.sourceLink->setEnabled(true);\n \t\t\tif (ret < 0)\n \t\t\t\treturn ret;\n \t\t}\n@@ -580,10 +580,10 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,\n \t\treturn ret;\n \n \tfor (const Entity &e : entities_) {\n-\t\tif (!e.link)\n+\t\tif (!e.sourceLink)\n \t\t\tbreak;\n \n-\t\tMediaLink *link = e.link;\n+\t\tMediaLink *link = e.sourceLink;\n \t\tMediaPad *source = link->source();\n \t\tMediaPad *sink = link->sink();\n \n","prefixes":["libcamera-devel"]}