{"id":9816,"url":"https://patchwork.libcamera.org/api/1.1/patches/9816/?format=json","web_url":"https://patchwork.libcamera.org/patch/9816/","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":"<20200925014207.1455796-19-niklas.soderlund@ragnatech.se>","date":"2020-09-25T01:42:03","name":"[libcamera-devel,v3,18/22] libcamera: pipeline: rkisp1: Add wrappers for accessing the path video device","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1ef37d99a5b45559f365252c35ad6969a3796db2","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9816/mbox/","series":[{"id":1325,"url":"https://patchwork.libcamera.org/api/1.1/series/1325/?format=json","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/9816/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9816/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 4B358C3B5E\n\tfor ;\n\tFri, 25 Sep 2020 01:43:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1801A63034;\n\tFri, 25 Sep 2020 03:43:01 +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 B208C63012\n\tfor ;\n\tFri, 25 Sep 2020 03:42:55 +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 6e217272-fed0-11ea-92dc-005056917a89;\n\tFri, 25 Sep 2020 03:42:54 +0200 (CEST)"],"X-Halon-ID":"6e217272-fed0-11ea-92dc-005056917a89","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 25 Sep 2020 03:42:03 +0200","Message-Id":"<20200925014207.1455796-19-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 18/22] libcamera: pipeline: rkisp1: Add\n\twrappers for accessing the path video device","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":"As a step to be able to make RkISP1Path::video_ private add simple\nwrappers for buffer handling. There is no functional change.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 12 ++++++------\n src/libcamera/pipeline/rkisp1/rkisp1path.cpp | 6 ++++++\n src/libcamera/pipeline/rkisp1/rkisp1path.h | 10 +++++++++-\n 3 files changed, 21 insertions(+), 7 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 114aee3e180afb77..7dd4fb11c39dd811 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -403,10 +403,10 @@ protected:\n \t\tpipe_->stat_->queueBuffer(info->statBuffer);\n \n \t\tif (info->mainPathBuffer)\n-\t\t\tpipe_->mainPath_.video_->queueBuffer(info->mainPathBuffer);\n+\t\t\tpipe_->mainPath_.queueBuffer(info->mainPathBuffer);\n \n \t\tif (info->selfPathBuffer)\n-\t\t\tpipe_->selfPath_.video_->queueBuffer(info->selfPathBuffer);\n+\t\t\tpipe_->selfPath_.queueBuffer(info->selfPathBuffer);\n \t}\n \n private:\n@@ -752,9 +752,9 @@ int PipelineHandlerRkISP1::exportFrameBuffers([[maybe_unused]] Camera *camera, S\n \tunsigned int count = stream->configuration().bufferCount;\n \n \tif (stream == &data->mainPathStream_)\n-\t\treturn mainPath_.video_->exportBuffers(count, buffers);\n+\t\treturn mainPath_.exportBuffers(count, buffers);\n \telse if (stream == &data->selfPathStream_)\n-\t\treturn selfPath_.video_->exportBuffers(count, buffers);\n+\t\treturn selfPath_.exportBuffers(count, buffers);\n \n \treturn -EINVAL;\n }\n@@ -1154,8 +1154,8 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tif (!selfPath_.init(media_))\n \t\treturn false;\n \n-\tmainPath_.video_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady);\n-\tselfPath_.video_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady);\n+\tmainPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady);\n+\tselfPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady);\n \tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n \tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\nindex 0be4d20bb1cd2094..74eaa5d32388184b 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1path.cpp\n@@ -149,6 +149,12 @@ int RkISP1Path::configure(const StreamConfiguration &config,\n \treturn 0;\n }\n \n+int RkISP1Path::exportBuffers(unsigned int bufferCount,\n+\t\t\t std::vector> *buffers)\n+{\n+\treturn video_->exportBuffers(bufferCount, buffers);\n+}\n+\n RkISP1MainPath::RkISP1MainPath()\n \t: RkISP1Path(\"main\",\n \t\t {\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1path.h b/src/libcamera/pipeline/rkisp1/rkisp1path.h\nindex 5b2917c746ee1d95..1315b2c64feac681 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1path.h\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1path.h\n@@ -10,6 +10,9 @@\n #include \n \n #include \n+#include \n+\n+#include \"libcamera/internal/v4l2_videodevice.h\"\n \n namespace libcamera {\n \n@@ -17,7 +20,6 @@ class MediaDevice;\n class PixelFormat;\n class Size;\n class V4L2Subdevice;\n-class V4L2VideoDevice;\n struct StreamConfiguration;\n struct V4L2SubdeviceFormat;\n \n@@ -36,6 +38,12 @@ public:\n \tint configure(const StreamConfiguration &config,\n \t\t const V4L2SubdeviceFormat &inputFormat);\n \n+\tint exportBuffers(unsigned int bufferCount,\n+\t\t\t std::vector> *buffers);\n+\n+\tint queueBuffer(FrameBuffer *buffer) { return video_->queueBuffer(buffer); }\n+\tSignal &bufferReady() { return video_->bufferReady; }\n+\n \t/* \\todo Make video private. */\n \tV4L2VideoDevice *video_;\n \n","prefixes":["libcamera-devel","v3","18/22"]}