{"id":2371,"url":"https://patchwork.libcamera.org/api/patches/2371/?format=json","web_url":"https://patchwork.libcamera.org/patch/2371/","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":"<20191126233620.1695316-24-niklas.soderlund@ragnatech.se>","date":"2019-11-26T23:36:13","name":"[libcamera-devel,23/30] libcamera: pipelines: Switch to V4L2Stream","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cd6089168f920d28c8e5266e86075f426f9ba9b0","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/2371/mbox/","series":[{"id":579,"url":"https://patchwork.libcamera.org/api/series/579/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=579","date":"2019-11-26T23:35:50","name":"libcamera: Rework buffer API","version":1,"mbox":"https://patchwork.libcamera.org/series/579/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2371/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2371/checks/","tags":{},"headers":{"Return-Path":"","Received":["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 22C7961C58\n\tfor ;\n\tWed, 27 Nov 2019 00:39:44 +0100 (CET)","from bismarck.berto.se (p54ac5865.dip0.t-ipconnect.de\n\t[84.172.88.101]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 050961bd-10a6-11ea-a0b9-005056917f90;\n\tWed, 27 Nov 2019 00:39:42 +0100 (CET)"],"X-Halon-ID":"050961bd-10a6-11ea-a0b9-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 27 Nov 2019 00:36:13 +0100","Message-Id":"<20191126233620.1695316-24-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.0","In-Reply-To":"<20191126233620.1695316-1-niklas.soderlund@ragnatech.se>","References":"<20191126233620.1695316-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 23/30] libcamera: pipelines: Switch to\n\tV4L2Stream","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","X-List-Received-Date":"Tue, 26 Nov 2019 23:39:44 -0000"},"content":"Prepare to switch to the FrameBuffer interface by using V4L2Stream. This\ndoes not break current operations as changes in applications are needed\nto switch interface.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 5 +++--\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n src/libcamera/pipeline/uvcvideo.cpp | 2 +-\n src/libcamera/pipeline/vimc.cpp | 2 +-\n 4 files changed, 6 insertions(+), 5 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 094c4db6bc32b683..5080ac6c4d0abe3b 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -135,11 +135,12 @@ public:\n \tBufferPool pool_;\n };\n \n-class IPU3Stream : public Stream\n+class IPU3Stream : public V4L2Stream\n {\n public:\n \tIPU3Stream(ImgUDevice::ImgUOutput *device, const std::string &name)\n-\t\t: active_(false), name_(name), device_(device)\n+\t\t: V4L2Stream(device->dev), active_(false), name_(name),\n+\t\t device_(device)\n \t{\n \t}\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 1ae50bec0d401b3f..ca3d92c7ad637c3a 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -888,7 +888,7 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \tstd::unique_ptr data =\n \t\tutils::make_unique(this);\n \n-\tdata->stream_ = new Stream();\n+\tdata->stream_ = new V4L2Stream(video_);\n \n \tControlInfoMap::Map ctrls;\n \tctrls.emplace(std::piecewise_construct,\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 64fc488912e5a82f..9cc90bf454cb4392 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -331,7 +331,7 @@ int UVCCameraData::init(MediaEntity *entity)\n \tif (ret)\n \t\treturn ret;\n \n-\tstream_ = new Stream();\n+\tstream_ = new V4L2Stream(video_);\n \n \tvideo_->bufferReady.connect(this, &UVCCameraData::bufferReady);\n \ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 3f9e92163642f0c2..b1222bd21fb629a0 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -420,7 +420,7 @@ int VimcCameraData::init(MediaDevice *media)\n \tif (video_->open())\n \t\treturn -ENODEV;\n \n-\tstream_ = new Stream();\n+\tstream_ = new V4L2Stream(video_);\n \n \tvideo_->bufferReady.connect(this, &VimcCameraData::bufferReady);\n \n","prefixes":["libcamera-devel","23/30"]}