{"id":9301,"url":"https://patchwork.libcamera.org/api/patches/9301/?format=json","web_url":"https://patchwork.libcamera.org/patch/9301/","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-12-niklas.soderlund@ragnatech.se>","date":"2020-08-13T00:52:44","name":"[libcamera-devel,11/13] libcamera: pipeline: rkisp1: Track buffers for self path","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0cb91d2406bbbd019a396b669d6c73fae1415476","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/9301/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/9301/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9301/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 6BEF5BD87E\n\tfor ;\n\tThu, 13 Aug 2020 00:53:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2E19C613C5;\n\tThu, 13 Aug 2020 02:53:48 +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 20F43613A2\n\tfor ;\n\tThu, 13 Aug 2020 02:53:45 +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 6f8f9200-dcff-11ea-92dc-005056917a89;\n\tThu, 13 Aug 2020 02:53:43 +0200 (CEST)"],"X-Halon-ID":"6f8f9200-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:44 +0200","Message-Id":"<20200813005246.3265807-12-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 11/13] libcamera: pipeline: rkisp1: Track\n\tbuffers for self path","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 extend\nRkISP1FrameInfo to track buffers from the self path stream.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 15 ++++++++++++---\n 1 file changed, 12 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 671098e11a2e2750..3761b7ef7a9386e3 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -67,6 +67,7 @@ struct RkISP1FrameInfo {\n \tFrameBuffer *paramBuffer;\n \tFrameBuffer *statBuffer;\n \tFrameBuffer *mainPathBuffer;\n+\tFrameBuffer *selfPathBuffer;\n \n \tbool paramFilled;\n \tbool paramDequeued;\n@@ -270,7 +271,8 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req\n \tFrameBuffer *statBuffer = pipe_->availableStatBuffers_.front();\n \n \tFrameBuffer *mainPathBuffer = request->findBuffer(&data->mainPathStream_);\n-\tif (!mainPathBuffer) {\n+\tFrameBuffer *selfPathBuffer = request->findBuffer(&data->selfPathStream_);\n+\tif (!mainPathBuffer && !selfPathBuffer) {\n \t\tLOG(RkISP1, Error)\n \t\t\t<< \"Attempt to queue request with invalid stream\";\n \t\treturn nullptr;\n@@ -285,6 +287,7 @@ RkISP1FrameInfo *RkISP1Frames::create(const RkISP1CameraData *data, Request *req\n \tinfo->request = request;\n \tinfo->paramBuffer = paramBuffer;\n \tinfo->mainPathBuffer = mainPathBuffer;\n+\tinfo->selfPathBuffer = selfPathBuffer;\n \tinfo->statBuffer = statBuffer;\n \tinfo->paramFilled = false;\n \tinfo->paramDequeued = false;\n@@ -343,7 +346,8 @@ RkISP1FrameInfo *RkISP1Frames::find(FrameBuffer *buffer)\n \n \t\tif (info->paramBuffer == buffer ||\n \t\t info->statBuffer == buffer ||\n-\t\t info->mainPathBuffer == buffer)\n+\t\t info->mainPathBuffer == buffer ||\n+\t\t info->selfPathBuffer == buffer)\n \t\t\treturn info;\n \t}\n \n@@ -415,7 +419,12 @@ protected:\n \n \t\tpipe_->param_->queueBuffer(info->paramBuffer);\n \t\tpipe_->stat_->queueBuffer(info->statBuffer);\n-\t\tpipe_->mainPathVideo_->queueBuffer(info->mainPathBuffer);\n+\n+\t\tif (info->mainPathBuffer)\n+\t\t\tpipe_->mainPathVideo_->queueBuffer(info->mainPathBuffer);\n+\n+\t\tif (info->selfPathBuffer)\n+\t\t\tpipe_->selfPathVideo_->queueBuffer(info->selfPathBuffer);\n \t}\n \n private:\n","prefixes":["libcamera-devel","11/13"]}