Patch Detail
Show a patch.
GET /api/patches/9819/?format=api
{ "id": 9819, "url": "https://patchwork.libcamera.org/api/patches/9819/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9819/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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-22-niklas.soderlund@ragnatech.se>", "date": "2020-09-25T01:42:06", "name": "[libcamera-devel,v3,21/22] libcamera: pipeline: rkisp1: Use the media link to track if a path is enabled", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "03a7f1ccaf3c156646756732c3095f875445adba", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9819/mbox/", "series": [ { "id": 1325, "url": "https://patchwork.libcamera.org/api/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/9819/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9819/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 1C4F6C3B5E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 25 Sep 2020 01:43:04 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E48786303A;\n\tFri, 25 Sep 2020 03:43:03 +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 D5C506302E\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 6f5dafd1-fed0-11ea-92dc-005056917a89;\n\tFri, 25 Sep 2020 03:42:56 +0200 (CEST)" ], "X-Halon-ID": "6f5dafd1-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:06 +0200", "Message-Id": "<20200925014207.1455796-22-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 21/22] libcamera: pipeline: rkisp1: Use\n\tthe media link to track if a path is enabled", "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": "Instead of manually track if a path is enable or not use the media graph\nlink status. This enables RkISP1Path::start() to check the link status\nthus allowing it to always be called from PipelineHandlerRkISP1::start()\nmaking the code simpler. There is no functional changed.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 82 +++++++++-----------\n src/libcamera/pipeline/rkisp1/rkisp1path.cpp | 3 +\n src/libcamera/pipeline/rkisp1/rkisp1path.h | 1 +\n 3 files changed, 39 insertions(+), 47 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex e41a9a51bda576b0..c6c2e3aa3dc6d0dc 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -122,8 +122,7 @@ public:\n \tRkISP1CameraData(PipelineHandler *pipe, RkISP1MainPath *mainPath,\n \t\t\t RkISP1SelfPath *selfPath)\n \t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n-\t\t frameInfo_(pipe), mainPath_(mainPath), selfPath_(selfPath),\n-\t\t mainPathActive_(false), selfPathActive_(false)\n+\t\t frameInfo_(pipe), mainPath_(mainPath), selfPath_(selfPath)\n \t{\n \t}\n \n@@ -145,9 +144,6 @@ public:\n \tRkISP1MainPath *mainPath_;\n \tRkISP1SelfPath *selfPath_;\n \n-\tbool mainPathActive_;\n-\tbool selfPathActive_;\n-\n private:\n \tvoid queueFrameAction(unsigned int frame,\n \t\t\t const IPAOperationData &action);\n@@ -714,20 +710,14 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \n \tLOG(RkISP1, Debug) << \"ISP output pad configured with \" << format.toString();\n \n-\tdata->mainPathActive_ = false;\n-\tdata->selfPathActive_ = false;\n \tfor (const StreamConfiguration &cfg : *config) {\n-\t\tif (cfg.stream() == &data->mainPathStream_) {\n+\t\tif (cfg.stream() == &data->mainPathStream_)\n \t\t\tret = mainPath_.configure(cfg, format);\n-\t\t\tif (ret)\n-\t\t\t\treturn ret;\n-\t\t\tdata->mainPathActive_ = true;\n-\t\t} else {\n+\t\telse\n \t\t\tret = selfPath_.configure(cfg, format);\n-\t\t\tif (ret)\n-\t\t\t\treturn ret;\n-\t\t\tdata->selfPathActive_ = true;\n-\t\t}\n+\n+\t\tif (ret)\n+\t\t\treturn ret;\n \t}\n \n \tV4L2DeviceFormat paramFormat = {};\n@@ -871,39 +861,23 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n \t\treturn ret;\n \t}\n \n-\tstd::map<unsigned int, IPAStream> streamConfig;\n-\n-\tif (data->mainPathActive_) {\n-\t\tret = mainPath_.start();\n-\t\tif (ret) {\n-\t\t\tparam_->streamOff();\n-\t\t\tstat_->streamOff();\n-\t\t\tdata->ipa_->stop();\n-\t\t\tfreeBuffers(camera);\n-\t\t\treturn ret;\n-\t\t}\n-\n-\t\tstreamConfig[0] = {\n-\t\t\t.pixelFormat = data->mainPathStream_.configuration().pixelFormat,\n-\t\t\t.size = data->mainPathStream_.configuration().size,\n-\t\t};\n+\tret = mainPath_.start();\n+\tif (ret) {\n+\t\tparam_->streamOff();\n+\t\tstat_->streamOff();\n+\t\tdata->ipa_->stop();\n+\t\tfreeBuffers(camera);\n+\t\treturn ret;\n \t}\n \n-\tif (data->selfPathActive_) {\n-\t\tret = selfPath_.start();\n-\t\tif (ret) {\n-\t\t\tmainPath_.stop();\n-\t\t\tparam_->streamOff();\n-\t\t\tstat_->streamOff();\n-\t\t\tdata->ipa_->stop();\n-\t\t\tfreeBuffers(camera);\n-\t\t\treturn ret;\n-\t\t}\n-\n-\t\tstreamConfig[1] = {\n-\t\t\t.pixelFormat = data->selfPathStream_.configuration().pixelFormat,\n-\t\t\t.size = data->selfPathStream_.configuration().size,\n-\t\t};\n+\tret = selfPath_.start();\n+\tif (ret) {\n+\t\tmainPath_.stop();\n+\t\tparam_->streamOff();\n+\t\tstat_->streamOff();\n+\t\tdata->ipa_->stop();\n+\t\tfreeBuffers(camera);\n+\t\treturn ret;\n \t}\n \n \tactiveCamera_ = camera;\n@@ -918,6 +892,20 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n \t\tret = 0;\n \t}\n \n+\tstd::map<unsigned int, IPAStream> streamConfig;\n+\tif (data->mainPath_->isEnabled()) {\n+\t\tstreamConfig[0] = {\n+\t\t\t.pixelFormat = data->mainPathStream_.configuration().pixelFormat,\n+\t\t\t.size = data->mainPathStream_.configuration().size,\n+\t\t};\n+\t}\n+\tif (data->selfPath_->isEnabled()) {\n+\t\tstreamConfig[1] = {\n+\t\t\t.pixelFormat = data->selfPathStream_.configuration().pixelFormat,\n+\t\t\t.size = data->selfPathStream_.configuration().size,\n+\t\t};\n+\t}\n+\n \tstd::map<unsigned int, const ControlInfoMap &> entityControls;\n \tentityControls.emplace(0, data->sensor_->controls());\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\nindex 8010cb92423c8269..623ee91888acd983 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\n@@ -163,6 +163,9 @@ int RkISP1Path::start()\n {\n \tint ret;\n \n+\tif (!isEnabled())\n+\t\treturn 0;\n+\n \tif (running_)\n \t\treturn -EBUSY;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.h b/src/libcamera/pipeline/rkisp1/rkisp1path.h\nindex f57f4b646c3a3164..01f9c751f9e54c64 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1path.h\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1path.h\n@@ -34,6 +34,7 @@ public:\n \tbool init(MediaDevice *media);\n \n \tint enable() { return link_->setEnabled(true); }\n+\tbool isEnabled() { return link_->flags() & MEDIA_LNK_FL_ENABLED; }\n \n \tStreamConfiguration generateConfiguration(const Size &resolution);\n \tCameraConfiguration::Status validate(StreamConfiguration *cfg);\n", "prefixes": [ "libcamera-devel", "v3", "21/22" ] }