[{"id":3170,"web_url":"https://patchwork.libcamera.org/comment/3170/","msgid":"<20191202122015.2u27lcrciv6y24on@uno.localdomain>","date":"2019-12-02T12:20:15","subject":"Re: [libcamera-devel] [PATCH 23/30] libcamera: pipelines: Switch to\n\tV4L2Stream","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas,\n\nOn Wed, Nov 27, 2019 at 12:36:13AM +0100, Niklas Söderlund wrote:\n> Prepare to switch to the FrameBuffer interface by using V4L2Stream. This\n> does not break current operations as changes in applications are needed\n> to switch interface.\n\nI would move 21/30 after 22/30 and merge it with this one\n>\n> Signed-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(-)\n>\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 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>\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 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,\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 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>\n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index 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> --\n> 2.24.0\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A673760BC4\n\tfor ;\n\tMon, 2 Dec 2019 13:18:06 +0100 (CET)","from uno.localdomain (93-34-114-233.ip49.fastwebnet.it\n\t[93.34.114.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 35D2F4000E;\n\tMon, 2 Dec 2019 12:18:05 +0000 (UTC)"],"X-Originating-IP":"93.34.114.233","Date":"Mon, 2 Dec 2019 13:20:15 +0100","From":"Jacopo Mondi ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191202122015.2u27lcrciv6y24on@uno.localdomain>","References":"<20191126233620.1695316-1-niklas.soderlund@ragnatech.se>\n\t<20191126233620.1695316-24-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"3jequfovr2tcwbjg\"","Content-Disposition":"inline","In-Reply-To":"<20191126233620.1695316-24-niklas.soderlund@ragnatech.se>","User-Agent":"NeoMutt/20180716","Subject":"Re: [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":"Mon, 02 Dec 2019 12:18:06 -0000"}},{"id":3249,"web_url":"https://patchwork.libcamera.org/comment/3249/","msgid":"<20191215015122.GF16015@pendragon.ideasonboard.com>","date":"2019-12-15T01:51:22","subject":"Re: [libcamera-devel] [PATCH 23/30] libcamera: pipelines: Switch to\n\tV4L2Stream","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Mon, Dec 02, 2019 at 01:20:15PM +0100, Jacopo Mondi wrote:\n> On Wed, Nov 27, 2019 at 12:36:13AM +0100, Niklas Söderlund wrote:\n> > Prepare to switch to the FrameBuffer interface by using V4L2Stream. This\n> > does not break current operations as changes in applications are needed\n> > to switch interface.\n> \n> I would move 21/30 after 22/30 and merge it with this one\n\nAgreed.\n\n> > Signed-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(-)\n> >\n> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > index 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> >\n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > index 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,\n> > diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> > index 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> >\n> > diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> > index 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> >","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8615D601E5\n\tfor ;\n\tSun, 15 Dec 2019 02:51:33 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F0B642D1;\n\tSun, 15 Dec 2019 02:51:32 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1576374693;\n\tbh=ZIOy1B9iyKKEEZVvuvHWNqfAK1NLLttdw7jTWfqVlEk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=oxWyLC13Xb53eC4jTezeon2c/Cca1KfmeTv4E5jnl0r+ZvzT59O3tqXkURIgrJgDp\n\tQggk6cqAe4O1p0DDGyfDmj1mV4jb06U3RaGse6U0c54KTFTEHV9d+81fTjE6MI9o0P\n\tlDv2owyMKolodSnBv6Y+ne7KLmHWO33Xadr+hB7k=","Date":"Sun, 15 Dec 2019 03:51:22 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","Message-ID":"<20191215015122.GF16015@pendragon.ideasonboard.com>","References":"<20191126233620.1695316-1-niklas.soderlund@ragnatech.se>\n\t<20191126233620.1695316-24-niklas.soderlund@ragnatech.se>\n\t<20191202122015.2u27lcrciv6y24on@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20191202122015.2u27lcrciv6y24on@uno.localdomain>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [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":"Sun, 15 Dec 2019 01:51:33 -0000"}}]