Patch Detail
Show a patch.
GET /api/1.1/patches/9818/?format=api
{ "id": 9818, "url": "https://patchwork.libcamera.org/api/1.1/patches/9818/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9818/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200925014207.1455796-21-niklas.soderlund@ragnatech.se>", "date": "2020-09-25T01:42:05", "name": "[libcamera-devel,v3,20/22] libcamera: pipeline: rkisp1: Move path link handling to RkISP1Path", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "14c971a717da15c2bbcab9d6ba7b8334a9db1dc7", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/1.1/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9818/mbox/", "series": [ { "id": 1325, "url": "https://patchwork.libcamera.org/api/1.1/series/1325/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1325", "date": "2020-09-25T01:41:45", "name": "libcamera: pipeline: rkisp1: Extend to support two streams", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1325/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9818/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9818/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 E4B6AC3B5C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 25 Sep 2020 01:43:03 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BFE0B6302C;\n\tFri, 25 Sep 2020 03:43:03 +0200 (CEST)", "from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1CB7F60576\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Sep 2020 03:42:57 +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 6eff0769-fed0-11ea-92dc-005056917a89;\n\tFri, 25 Sep 2020 03:42:55 +0200 (CEST)" ], "X-Halon-ID": "6eff0769-fed0-11ea-92dc-005056917a89", "Authorized-sender": "niklas.soderlund@fsdn.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 25 Sep 2020 03:42:05 +0200", "Message-Id": "<20200925014207.1455796-21-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>", "References": "<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Subject": "[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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Move the path link handling to RkISP1Path, there is no functional\nchange.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\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(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 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}\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\nindex 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<PixelFormat> &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 \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.h b/src/libcamera/pipeline/rkisp1/rkisp1path.h\nindex 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 <libcamera/camera.h>\n #include <libcamera/signal.h>\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\n", "prefixes": [ "libcamera-devel", "v3", "20/22" ] }