Patch Detail
Show a patch.
GET /api/patches/9299/?format=api
{ "id": 9299, "url": "https://patchwork.libcamera.org/api/patches/9299/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9299/", "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": "<20200813005246.3265807-10-niklas.soderlund@ragnatech.se>", "date": "2020-08-13T00:52:42", "name": "[libcamera-devel,09/13] libcamera: pipeline: rkisp1: Add self path devices", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d3087ff6bdff322bfc6197e688e0bc68bcbda28f", "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/9299/mbox/", "series": [ { "id": 1215, "url": "https://patchwork.libcamera.org/api/series/1215/?format=api", "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/9299/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9299/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 AFFA2BD87E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 13 Aug 2020 00:53:47 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 69013613C2;\n\tThu, 13 Aug 2020 02:53:47 +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 AA57B613A2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 Aug 2020 02:53:42 +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 6e1168a0-dcff-11ea-92dc-005056917a89;\n\tThu, 13 Aug 2020 02:53:41 +0200 (CEST)" ], "X-Halon-ID": "6e1168a0-dcff-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": "Thu, 13 Aug 2020 02:52:42 +0200", "Message-Id": "<20200813005246.3265807-10-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 09/13] libcamera: pipeline: rkisp1: Add\n\tself path devices", "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": "Add the V4L2 device nodes needed to operate the self path.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 26 ++++++++++++++++++++----\n 1 file changed, 22 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 60179a1151f18491..132878c13b10b555 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -129,9 +129,11 @@ public:\n class RkISP1CameraData : public CameraData\n {\n public:\n-\tRkISP1CameraData(PipelineHandler *pipe, V4L2VideoDevice *video)\n+\tRkISP1CameraData(PipelineHandler *pipe, V4L2VideoDevice *mainPathVideo,\n+\t\t\t V4L2VideoDevice *selfPathVideo)\n \t\t: CameraData(pipe), sensor_(nullptr), frame_(0),\n-\t\t frameInfo_(pipe), mainPathVideo_(video)\n+\t\t frameInfo_(pipe), mainPathVideo_(mainPathVideo),\n+\t\t selfPathVideo_(selfPathVideo)\n \t{\n \t}\n \n@@ -150,6 +152,7 @@ public:\n \tRkISP1Timeline timeline_;\n \n \tV4L2VideoDevice *mainPathVideo_;\n+\tV4L2VideoDevice *selfPathVideo_;\n \n private:\n \tvoid queueFrameAction(unsigned int frame,\n@@ -226,7 +229,9 @@ private:\n \tMediaDevice *media_;\n \tV4L2Subdevice *isp_;\n \tV4L2Subdevice *mainPathResizer_;\n+\tV4L2Subdevice *selfPathResizer_;\n \tV4L2VideoDevice *mainPathVideo_;\n+\tV4L2VideoDevice *selfPathVideo_;\n \tV4L2VideoDevice *param_;\n \tV4L2VideoDevice *stat_;\n \n@@ -559,7 +564,8 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \n PipelineHandlerRkISP1::PipelineHandlerRkISP1(CameraManager *manager)\n \t: PipelineHandler(manager), isp_(nullptr), mainPathResizer_(nullptr),\n-\t mainPathVideo_(nullptr), param_(nullptr), stat_(nullptr)\n+\t selfPathResizer_(nullptr), mainPathVideo_(nullptr),\n+\t selfPathVideo_(nullptr), param_(nullptr), stat_(nullptr)\n {\n }\n \n@@ -568,7 +574,9 @@ PipelineHandlerRkISP1::~PipelineHandlerRkISP1()\n \tdelete param_;\n \tdelete stat_;\n \tdelete mainPathVideo_;\n+\tdelete selfPathVideo_;\n \tdelete mainPathResizer_;\n+\tdelete selfPathResizer_;\n \tdelete isp_;\n }\n \n@@ -972,7 +980,8 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \tint ret;\n \n \tstd::unique_ptr<RkISP1CameraData> data =\n-\t\tstd::make_unique<RkISP1CameraData>(this, mainPathVideo_);\n+\t\tstd::make_unique<RkISP1CameraData>(this, mainPathVideo_,\n+\t\t\t\t\t\t selfPathVideo_);\n \n \tControlInfoMap::Map ctrls;\n \tctrls.emplace(std::piecewise_construct,\n@@ -1027,11 +1036,19 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tif (mainPathResizer_->open() < 0)\n \t\treturn false;\n \n+\tselfPathResizer_ = V4L2Subdevice::fromEntityName(media_, \"rkisp1_resizer_selfpath\");\n+\tif (selfPathResizer_->open() < 0)\n+\t\treturn false;\n+\n \t/* Locate and open the capture video node. */\n \tmainPathVideo_ = V4L2VideoDevice::fromEntityName(media_, \"rkisp1_mainpath\");\n \tif (mainPathVideo_->open() < 0)\n \t\treturn false;\n \n+\tselfPathVideo_ = V4L2VideoDevice::fromEntityName(media_, \"rkisp1_selfpath\");\n+\tif (selfPathVideo_->open() < 0)\n+\t\treturn false;\n+\n \tstat_ = V4L2VideoDevice::fromEntityName(media_, \"rkisp1_stats\");\n \tif (stat_->open() < 0)\n \t\treturn false;\n@@ -1041,6 +1058,7 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \n \tmainPathVideo_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady);\n+\tselfPathVideo_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady);\n \tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n \tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n \n", "prefixes": [ "libcamera-devel", "09/13" ] }