[{"id":10898,"web_url":"https://patchwork.libcamera.org/comment/10898/","msgid":"<20200627100811.pw7k72h2ctogoqya@uno.localdomain>","date":"2020-06-27T10:08:11","subject":"Re: [libcamera-devel] [PATCH 13/13] libcamera: ipu3: imgu: Remove\n\tImgUOutput","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"On Sat, Jun 27, 2020 at 05:00:43AM +0200, Niklas Söderlund wrote:\n> The struct ImgUOutput now only contains one member that are in use, the\n\nis in use\n\n> video device. Remove the struct and use the video device directly\n> instead.\n>\n> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> ---\n>  src/libcamera/pipeline/ipu3/imgu.cpp | 55 ++++++++++++----------------\n>  src/libcamera/pipeline/ipu3/imgu.h   | 25 ++++---------\n>  src/libcamera/pipeline/ipu3/ipu3.cpp | 12 +++---\n>  3 files changed, 37 insertions(+), 55 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\n> index d54e844d9bfc5147..a601ca3fa2b1803f 100644\n> --- a/src/libcamera/pipeline/ipu3/imgu.cpp\n> +++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n> @@ -55,31 +55,22 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)\n>  \tif (ret)\n>  \t\treturn ret;\n>\n> -\toutput_.dev = V4L2VideoDevice::fromEntityName(media, name_ + \" output\");\n> -\tret = output_.dev->open();\n> +\toutput_ = V4L2VideoDevice::fromEntityName(media, name_ + \" output\");\n> +\tret = output_->open();\n>  \tif (ret)\n>  \t\treturn ret;\n>\n> -\toutput_.pad = PAD_OUTPUT;\n> -\toutput_.name = \"output\";\n> -\n> -\tviewfinder_.dev = V4L2VideoDevice::fromEntityName(media,\n> +\tviewfinder_ = V4L2VideoDevice::fromEntityName(media,\n>  \t\t\t\t\t\t\t  name_ + \" viewfinder\");\n> -\tret = viewfinder_.dev->open();\n> +\tret = viewfinder_->open();\n>  \tif (ret)\n>  \t\treturn ret;\n>\n> -\tviewfinder_.pad = PAD_VF;\n> -\tviewfinder_.name = \"viewfinder\";\n> -\n> -\tstat_.dev = V4L2VideoDevice::fromEntityName(media, name_ + \" 3a stat\");\n> -\tret = stat_.dev->open();\n> +\tstat_ = V4L2VideoDevice::fromEntityName(media, name_ + \" 3a stat\");\n> +\tret = stat_->open();\n>  \tif (ret)\n>  \t\treturn ret;\n>\n> -\tstat_.pad = PAD_STAT;\n> -\tstat_.name = \"stat\";\n> -\n>  \treturn 0;\n>  }\n>\n> @@ -142,19 +133,19 @@ int ImgUDevice::configureInput(const Size &size,\n>  int ImgUDevice::configureOutput(const StreamConfiguration &cfg,\n>  \t\t\t\tV4L2DeviceFormat *outputFormat)\n>  {\n> -\treturn configureVideoDevice(output_.dev, PAD_OUTPUT, cfg, outputFormat);\n> +\treturn configureVideoDevice(output_, PAD_OUTPUT, cfg, outputFormat);\n>  }\n>\n>  int ImgUDevice::configureViewfinder(const StreamConfiguration &cfg,\n>  \t\t\t\t    V4L2DeviceFormat *outputFormat)\n>  {\n> -\treturn configureVideoDevice(viewfinder_.dev, PAD_VF, cfg, outputFormat);\n> +\treturn configureVideoDevice(viewfinder_, PAD_VF, cfg, outputFormat);\n>  }\n>\n>  int ImgUDevice::configureStat(const StreamConfiguration &cfg,\n>  \t\t\t      V4L2DeviceFormat *outputFormat)\n>  {\n> -\treturn configureVideoDevice(stat_.dev, PAD_STAT, cfg, outputFormat);\n> +\treturn configureVideoDevice(stat_, PAD_STAT, cfg, outputFormat);\n>  }\n>\n>  int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n> @@ -170,7 +161,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n>  \t\treturn ret;\n>\n>  \t/* No need to apply format to the stat node. */\n> -\tif (dev == stat_.dev)\n> +\tif (dev == stat_)\n>  \t\treturn 0;\n>\n>  \t*outputFormat = {};\n> @@ -182,7 +173,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n>  \tif (ret)\n>  \t\treturn ret;\n>\n> -\tconst char *name = dev == output_.dev ? \"output\" : \"viewfinder\";\n> +\tconst char *name = dev == output_ ? \"output\" : \"viewfinder\";\n>  \tLOG(IPU3, Debug) << \"ImgU \" << name << \" format = \"\n>  \t\t\t << outputFormat->toString();\n>\n> @@ -208,19 +199,19 @@ int ImgUDevice::allocateBuffers(unsigned int bufferCount)\n>  \t *\n>  \t * \\todo To be revised when we'll actually use the stat node.\n>  \t */\n> -\tret = stat_.dev->importBuffers(bufferCount);\n> +\tret = stat_->importBuffers(bufferCount);\n>  \tif (ret < 0) {\n>  \t\tLOG(IPU3, Error) << \"Failed to allocate ImgU stat buffers\";\n>  \t\tgoto error;\n>  \t}\n>\n> -\tret = output_.dev->importBuffers(bufferCount);\n> +\tret = output_->importBuffers(bufferCount);\n>  \tif (ret < 0) {\n>  \t\tLOG(IPU3, Error) << \"Failed to import ImgU output buffers\";\n>  \t\tgoto error;\n>  \t}\n>\n> -\tret = viewfinder_.dev->importBuffers(bufferCount);\n> +\tret = viewfinder_->importBuffers(bufferCount);\n>  \tif (ret < 0) {\n>  \t\tLOG(IPU3, Error) << \"Failed to import ImgU viewfinder buffers\";\n>  \t\tgoto error;\n> @@ -241,15 +232,15 @@ void ImgUDevice::freeBuffers()\n>  {\n>  \tint ret;\n>\n> -\tret = output_.dev->releaseBuffers();\n> +\tret = output_->releaseBuffers();\n>  \tif (ret)\n>  \t\tLOG(IPU3, Error) << \"Failed to release ImgU output buffers\";\n>\n> -\tret = stat_.dev->releaseBuffers();\n> +\tret = stat_->releaseBuffers();\n>  \tif (ret)\n>  \t\tLOG(IPU3, Error) << \"Failed to release ImgU stat buffers\";\n>\n> -\tret = viewfinder_.dev->releaseBuffers();\n> +\tret = viewfinder_->releaseBuffers();\n>  \tif (ret)\n>  \t\tLOG(IPU3, Error) << \"Failed to release ImgU viewfinder buffers\";\n>\n> @@ -263,19 +254,19 @@ int ImgUDevice::start()\n>  \tint ret;\n>\n>  \t/* Start the ImgU video devices. */\n> -\tret = output_.dev->streamOn();\n> +\tret = output_->streamOn();\n>  \tif (ret) {\n>  \t\tLOG(IPU3, Error) << \"Failed to start ImgU output\";\n>  \t\treturn ret;\n>  \t}\n>\n> -\tret = viewfinder_.dev->streamOn();\n> +\tret = viewfinder_->streamOn();\n>  \tif (ret) {\n>  \t\tLOG(IPU3, Error) << \"Failed to start ImgU viewfinder\";\n>  \t\treturn ret;\n>  \t}\n>\n> -\tret = stat_.dev->streamOn();\n> +\tret = stat_->streamOn();\n>  \tif (ret) {\n>  \t\tLOG(IPU3, Error) << \"Failed to start ImgU stat\";\n>  \t\treturn ret;\n> @@ -294,9 +285,9 @@ int ImgUDevice::stop()\n>  {\n>  \tint ret;\n>\n> -\tret = output_.dev->streamOff();\n> -\tret |= viewfinder_.dev->streamOff();\n> -\tret |= stat_.dev->streamOff();\n> +\tret = output_->streamOff();\n> +\tret |= viewfinder_->streamOff();\n> +\tret |= stat_->streamOff();\n>  \tret |= input_->streamOff();\n>\n>  \treturn ret;\n> diff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h\n> index f8fd54089753b40e..2ac77ce5719f88f1 100644\n> --- a/src/libcamera/pipeline/ipu3/imgu.h\n> +++ b/src/libcamera/pipeline/ipu3/imgu.h\n> @@ -24,28 +24,19 @@ struct StreamConfiguration;\n>  class ImgUDevice\n>  {\n>  public:\n> -\t/* ImgU output descriptor: group data specific to an ImgU output. */\n> -\tstruct ImgUOutput {\n> -\t\tV4L2VideoDevice *dev;\n> -\t\tunsigned int pad;\n> -\t\tstd::string name;\n> -\t};\n> -\n>  \tImgUDevice()\n> -\t\t: imgu_(nullptr), input_(nullptr)\n> +\t\t: imgu_(nullptr), input_(nullptr), output_(nullptr),\n> +\t\t  viewfinder_(nullptr), stat_(nullptr)\n>  \t{\n> -\t\toutput_.dev = nullptr;\n> -\t\tviewfinder_.dev = nullptr;\n> -\t\tstat_.dev = nullptr;\n>  \t}\n>\n>  \t~ImgUDevice()\n>  \t{\n>  \t\tdelete imgu_;\n>  \t\tdelete input_;\n> -\t\tdelete output_.dev;\n> -\t\tdelete viewfinder_.dev;\n> -\t\tdelete stat_.dev;\n> +\t\tdelete output_;\n> +\t\tdelete viewfinder_;\n> +\t\tdelete stat_;\n>  \t}\n>\n>  \tint init(MediaDevice *media, unsigned int index);\n> @@ -68,9 +59,9 @@ public:\n>\n>  \tV4L2Subdevice *imgu_;\n>  \tV4L2VideoDevice *input_;\n> -\tImgUOutput output_;\n> -\tImgUOutput viewfinder_;\n> -\tImgUOutput stat_;\n> +\tV4L2VideoDevice *output_;\n> +\tV4L2VideoDevice *viewfinder_;\n> +\tV4L2VideoDevice *stat_;\n>  \t/* \\todo Add param video device for 3A tuning */\n>\n>  private:\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 6ae4728b470f9487..c25bcaaeb5fb813f 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -561,9 +561,9 @@ int PipelineHandlerIPU3::exportFrameBuffers(Camera *camera, Stream *stream,\n>  \tunsigned int count = stream->configuration().bufferCount;\n>\n>  \tif (stream == &data->outStream_)\n> -\t\treturn data->imgu_.output_.dev->exportBuffers(count, buffers);\n> +\t\treturn data->imgu_.output_->exportBuffers(count, buffers);\n>  \telse if (stream == &data->vfStream_)\n> -\t\treturn data->imgu_.viewfinder_.dev->exportBuffers(count, buffers);\n> +\t\treturn data->imgu_.viewfinder_->exportBuffers(count, buffers);\n>  \telse if (stream == &data->rawStream_)\n>  \t\treturn data->cio2_.exportBuffers(count, buffers);\n>\n> @@ -678,9 +678,9 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n>  \t\tint ret;\n>\n>  \t\tif (stream == &data->outStream_)\n> -\t\t\tret = data->imgu_.output_.dev->queueBuffer(buffer);\n> +\t\t\tret = data->imgu_.output_->queueBuffer(buffer);\n>  \t\telse if (stream == &data->vfStream_)\n> -\t\t\tret = data->imgu_.viewfinder_.dev->queueBuffer(buffer);\n> +\t\t\tret = data->imgu_.viewfinder_->queueBuffer(buffer);\n>  \t\telse\n>  \t\t\tcontinue;\n>\n> @@ -802,9 +802,9 @@ int PipelineHandlerIPU3::registerCameras()\n>  \t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n>  \t\tdata->imgu_.input_->bufferReady.connect(&data->cio2_,\n>  \t\t\t\t\t&CIO2Device::tryReturnBuffer);\n> -\t\tdata->imgu_.output_.dev->bufferReady.connect(data.get(),\n> +\t\tdata->imgu_.output_->bufferReady.connect(data.get(),\n>  \t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n> -\t\tdata->imgu_.viewfinder_.dev->bufferReady.connect(data.get(),\n> +\t\tdata->imgu_.viewfinder_->bufferReady.connect(data.get(),\n>  \t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n>\n>  \t\t/* Create and register the Camera instance. */\n> --\n> 2.27.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":"<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 6D1F7C2E66\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 27 Jun 2020 10:04:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 16B98609D6;\n\tSat, 27 Jun 2020 12:04:42 +0200 (CEST)","from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4A470609C2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 27 Jun 2020 12:04:41 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 9EE9720002;\n\tSat, 27 Jun 2020 10:04:40 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Sat, 27 Jun 2020 12:08:11 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Niklas =?utf-8?q?S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","Message-ID":"<20200627100811.pw7k72h2ctogoqya@uno.localdomain>","References":"<20200627030043.2088585-1-niklas.soderlund@ragnatech.se>\n\t<20200627030043.2088585-14-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200627030043.2088585-14-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH 13/13] libcamera: ipu3: imgu: Remove\n\tImgUOutput","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>","Cc":"libcamera-devel@lists.libcamera.org","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>"}},{"id":10915,"web_url":"https://patchwork.libcamera.org/comment/10915/","msgid":"<20200627165204.GK5966@pendragon.ideasonboard.com>","date":"2020-06-27T16:52:04","subject":"Re: [libcamera-devel] [PATCH 13/13] libcamera: ipu3: imgu: Remove\n\tImgUOutput","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 Sat, Jun 27, 2020 at 05:00:43AM +0200, Niklas Söderlund wrote:\n> The struct ImgUOutput now only contains one member that are in use, the\n> video device. Remove the struct and use the video device directly\n> instead.\n> \n> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> ---\n>  src/libcamera/pipeline/ipu3/imgu.cpp | 55 ++++++++++++----------------\n>  src/libcamera/pipeline/ipu3/imgu.h   | 25 ++++---------\n>  src/libcamera/pipeline/ipu3/ipu3.cpp | 12 +++---\n>  3 files changed, 37 insertions(+), 55 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\n> index d54e844d9bfc5147..a601ca3fa2b1803f 100644\n> --- a/src/libcamera/pipeline/ipu3/imgu.cpp\n> +++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n> @@ -55,31 +55,22 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)\n>  \tif (ret)\n>  \t\treturn ret;\n>  \n> -\toutput_.dev = V4L2VideoDevice::fromEntityName(media, name_ + \" output\");\n> -\tret = output_.dev->open();\n> +\toutput_ = V4L2VideoDevice::fromEntityName(media, name_ + \" output\");\n> +\tret = output_->open();\n>  \tif (ret)\n>  \t\treturn ret;\n>  \n> -\toutput_.pad = PAD_OUTPUT;\n> -\toutput_.name = \"output\";\n> -\n> -\tviewfinder_.dev = V4L2VideoDevice::fromEntityName(media,\n> +\tviewfinder_ = V4L2VideoDevice::fromEntityName(media,\n>  \t\t\t\t\t\t\t  name_ + \" viewfinder\");\n\nWrong indentation.\n\n> -\tret = viewfinder_.dev->open();\n> +\tret = viewfinder_->open();\n>  \tif (ret)\n>  \t\treturn ret;\n>  \n> -\tviewfinder_.pad = PAD_VF;\n> -\tviewfinder_.name = \"viewfinder\";\n> -\n> -\tstat_.dev = V4L2VideoDevice::fromEntityName(media, name_ + \" 3a stat\");\n> -\tret = stat_.dev->open();\n> +\tstat_ = V4L2VideoDevice::fromEntityName(media, name_ + \" 3a stat\");\n> +\tret = stat_->open();\n>  \tif (ret)\n>  \t\treturn ret;\n>  \n> -\tstat_.pad = PAD_STAT;\n> -\tstat_.name = \"stat\";\n> -\n>  \treturn 0;\n>  }\n>  \n> @@ -142,19 +133,19 @@ int ImgUDevice::configureInput(const Size &size,\n>  int ImgUDevice::configureOutput(const StreamConfiguration &cfg,\n>  \t\t\t\tV4L2DeviceFormat *outputFormat)\n>  {\n> -\treturn configureVideoDevice(output_.dev, PAD_OUTPUT, cfg, outputFormat);\n> +\treturn configureVideoDevice(output_, PAD_OUTPUT, cfg, outputFormat);\n>  }\n>  \n>  int ImgUDevice::configureViewfinder(const StreamConfiguration &cfg,\n>  \t\t\t\t    V4L2DeviceFormat *outputFormat)\n>  {\n> -\treturn configureVideoDevice(viewfinder_.dev, PAD_VF, cfg, outputFormat);\n> +\treturn configureVideoDevice(viewfinder_, PAD_VF, cfg, outputFormat);\n>  }\n>  \n>  int ImgUDevice::configureStat(const StreamConfiguration &cfg,\n>  \t\t\t      V4L2DeviceFormat *outputFormat)\n>  {\n> -\treturn configureVideoDevice(stat_.dev, PAD_STAT, cfg, outputFormat);\n> +\treturn configureVideoDevice(stat_, PAD_STAT, cfg, outputFormat);\n>  }\n>  \n>  int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n> @@ -170,7 +161,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n>  \t\treturn ret;\n>  \n>  \t/* No need to apply format to the stat node. */\n> -\tif (dev == stat_.dev)\n> +\tif (dev == stat_)\n>  \t\treturn 0;\n>  \n>  \t*outputFormat = {};\n> @@ -182,7 +173,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n>  \tif (ret)\n>  \t\treturn ret;\n>  \n> -\tconst char *name = dev == output_.dev ? \"output\" : \"viewfinder\";\n> +\tconst char *name = dev == output_ ? \"output\" : \"viewfinder\";\n>  \tLOG(IPU3, Debug) << \"ImgU \" << name << \" format = \"\n>  \t\t\t << outputFormat->toString();\n>  \n> @@ -208,19 +199,19 @@ int ImgUDevice::allocateBuffers(unsigned int bufferCount)\n>  \t *\n>  \t * \\todo To be revised when we'll actually use the stat node.\n>  \t */\n> -\tret = stat_.dev->importBuffers(bufferCount);\n> +\tret = stat_->importBuffers(bufferCount);\n>  \tif (ret < 0) {\n>  \t\tLOG(IPU3, Error) << \"Failed to allocate ImgU stat buffers\";\n>  \t\tgoto error;\n>  \t}\n>  \n> -\tret = output_.dev->importBuffers(bufferCount);\n> +\tret = output_->importBuffers(bufferCount);\n>  \tif (ret < 0) {\n>  \t\tLOG(IPU3, Error) << \"Failed to import ImgU output buffers\";\n>  \t\tgoto error;\n>  \t}\n>  \n> -\tret = viewfinder_.dev->importBuffers(bufferCount);\n> +\tret = viewfinder_->importBuffers(bufferCount);\n>  \tif (ret < 0) {\n>  \t\tLOG(IPU3, Error) << \"Failed to import ImgU viewfinder buffers\";\n>  \t\tgoto error;\n> @@ -241,15 +232,15 @@ void ImgUDevice::freeBuffers()\n>  {\n>  \tint ret;\n>  \n> -\tret = output_.dev->releaseBuffers();\n> +\tret = output_->releaseBuffers();\n>  \tif (ret)\n>  \t\tLOG(IPU3, Error) << \"Failed to release ImgU output buffers\";\n>  \n> -\tret = stat_.dev->releaseBuffers();\n> +\tret = stat_->releaseBuffers();\n>  \tif (ret)\n>  \t\tLOG(IPU3, Error) << \"Failed to release ImgU stat buffers\";\n>  \n> -\tret = viewfinder_.dev->releaseBuffers();\n> +\tret = viewfinder_->releaseBuffers();\n>  \tif (ret)\n>  \t\tLOG(IPU3, Error) << \"Failed to release ImgU viewfinder buffers\";\n>  \n> @@ -263,19 +254,19 @@ int ImgUDevice::start()\n>  \tint ret;\n>  \n>  \t/* Start the ImgU video devices. */\n> -\tret = output_.dev->streamOn();\n> +\tret = output_->streamOn();\n>  \tif (ret) {\n>  \t\tLOG(IPU3, Error) << \"Failed to start ImgU output\";\n>  \t\treturn ret;\n>  \t}\n>  \n> -\tret = viewfinder_.dev->streamOn();\n> +\tret = viewfinder_->streamOn();\n>  \tif (ret) {\n>  \t\tLOG(IPU3, Error) << \"Failed to start ImgU viewfinder\";\n>  \t\treturn ret;\n>  \t}\n>  \n> -\tret = stat_.dev->streamOn();\n> +\tret = stat_->streamOn();\n>  \tif (ret) {\n>  \t\tLOG(IPU3, Error) << \"Failed to start ImgU stat\";\n>  \t\treturn ret;\n> @@ -294,9 +285,9 @@ int ImgUDevice::stop()\n>  {\n>  \tint ret;\n>  \n> -\tret = output_.dev->streamOff();\n> -\tret |= viewfinder_.dev->streamOff();\n> -\tret |= stat_.dev->streamOff();\n> +\tret = output_->streamOff();\n> +\tret |= viewfinder_->streamOff();\n> +\tret |= stat_->streamOff();\n>  \tret |= input_->streamOff();\n>  \n>  \treturn ret;\n> diff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h\n> index f8fd54089753b40e..2ac77ce5719f88f1 100644\n> --- a/src/libcamera/pipeline/ipu3/imgu.h\n> +++ b/src/libcamera/pipeline/ipu3/imgu.h\n> @@ -24,28 +24,19 @@ struct StreamConfiguration;\n>  class ImgUDevice\n>  {\n>  public:\n> -\t/* ImgU output descriptor: group data specific to an ImgU output. */\n> -\tstruct ImgUOutput {\n> -\t\tV4L2VideoDevice *dev;\n> -\t\tunsigned int pad;\n> -\t\tstd::string name;\n> -\t};\n> -\n>  \tImgUDevice()\n> -\t\t: imgu_(nullptr), input_(nullptr)\n> +\t\t: imgu_(nullptr), input_(nullptr), output_(nullptr),\n> +\t\t  viewfinder_(nullptr), stat_(nullptr)\n>  \t{\n> -\t\toutput_.dev = nullptr;\n> -\t\tviewfinder_.dev = nullptr;\n> -\t\tstat_.dev = nullptr;\n>  \t}\n>  \n>  \t~ImgUDevice()\n>  \t{\n>  \t\tdelete imgu_;\n>  \t\tdelete input_;\n> -\t\tdelete output_.dev;\n> -\t\tdelete viewfinder_.dev;\n> -\t\tdelete stat_.dev;\n> +\t\tdelete output_;\n> +\t\tdelete viewfinder_;\n> +\t\tdelete stat_;\n>  \t}\n>  \n>  \tint init(MediaDevice *media, unsigned int index);\n> @@ -68,9 +59,9 @@ public:\n>  \n>  \tV4L2Subdevice *imgu_;\n>  \tV4L2VideoDevice *input_;\n> -\tImgUOutput output_;\n> -\tImgUOutput viewfinder_;\n> -\tImgUOutput stat_;\n> +\tV4L2VideoDevice *output_;\n> +\tV4L2VideoDevice *viewfinder_;\n> +\tV4L2VideoDevice *stat_;\n\nYou could turn these into unique_ptr to simplify the constructor and\ndestructor.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n>  \t/* \\todo Add param video device for 3A tuning */\n>  \n>  private:\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 6ae4728b470f9487..c25bcaaeb5fb813f 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -561,9 +561,9 @@ int PipelineHandlerIPU3::exportFrameBuffers(Camera *camera, Stream *stream,\n>  \tunsigned int count = stream->configuration().bufferCount;\n>  \n>  \tif (stream == &data->outStream_)\n> -\t\treturn data->imgu_.output_.dev->exportBuffers(count, buffers);\n> +\t\treturn data->imgu_.output_->exportBuffers(count, buffers);\n>  \telse if (stream == &data->vfStream_)\n> -\t\treturn data->imgu_.viewfinder_.dev->exportBuffers(count, buffers);\n> +\t\treturn data->imgu_.viewfinder_->exportBuffers(count, buffers);\n>  \telse if (stream == &data->rawStream_)\n>  \t\treturn data->cio2_.exportBuffers(count, buffers);\n>  \n> @@ -678,9 +678,9 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n>  \t\tint ret;\n>  \n>  \t\tif (stream == &data->outStream_)\n> -\t\t\tret = data->imgu_.output_.dev->queueBuffer(buffer);\n> +\t\t\tret = data->imgu_.output_->queueBuffer(buffer);\n>  \t\telse if (stream == &data->vfStream_)\n> -\t\t\tret = data->imgu_.viewfinder_.dev->queueBuffer(buffer);\n> +\t\t\tret = data->imgu_.viewfinder_->queueBuffer(buffer);\n>  \t\telse\n>  \t\t\tcontinue;\n>  \n> @@ -802,9 +802,9 @@ int PipelineHandlerIPU3::registerCameras()\n>  \t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n>  \t\tdata->imgu_.input_->bufferReady.connect(&data->cio2_,\n>  \t\t\t\t\t&CIO2Device::tryReturnBuffer);\n> -\t\tdata->imgu_.output_.dev->bufferReady.connect(data.get(),\n> +\t\tdata->imgu_.output_->bufferReady.connect(data.get(),\n>  \t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n> -\t\tdata->imgu_.viewfinder_.dev->bufferReady.connect(data.get(),\n> +\t\tdata->imgu_.viewfinder_->bufferReady.connect(data.get(),\n>  \t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n>  \n>  \t\t/* Create and register the Camera instance. */","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 AE989C2E69\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 27 Jun 2020 16:52:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3D10F609D6;\n\tSat, 27 Jun 2020 18:52:09 +0200 (CEST)","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 9FA1E609C2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 27 Jun 2020 18:52:07 +0200 (CEST)","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 1B0C8576;\n\tSat, 27 Jun 2020 18:52:07 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"T6Iocpro\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593276727;\n\tbh=tVRrlYaYeeS6eyMLQDHXT7C0OoMVRpjkSyYGTnV4hQk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=T6Iocprouuf46JIctCvSyYrXEbGIClk5Sb1TQbShzhk3nHqsPHxknjJ/l3kSi6s/I\n\t7rte4dr/EIghkdJkCTOsI5JtcPrgJHWfoZQbHnUWHQvoZ9I5WJOFUdAExbEzlzWA4E\n\t+RgL0jlKh/D8LjnjScSoq0QjhVslFmLji8h6BYlY=","Date":"Sat, 27 Jun 2020 19:52:04 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Niklas =?utf-8?q?S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","Message-ID":"<20200627165204.GK5966@pendragon.ideasonboard.com>","References":"<20200627030043.2088585-1-niklas.soderlund@ragnatech.se>\n\t<20200627030043.2088585-14-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200627030043.2088585-14-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH 13/13] libcamera: ipu3: imgu: Remove\n\tImgUOutput","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>","Cc":"libcamera-devel@lists.libcamera.org","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>"}},{"id":10920,"web_url":"https://patchwork.libcamera.org/comment/10920/","msgid":"<20200627234747.GE1105424@oden.dyn.berto.se>","date":"2020-06-27T23:47:47","subject":"Re: [libcamera-devel] [PATCH 13/13] libcamera: ipu3: imgu: Remove\n\tImgUOutput","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your feedback.\n\nOn 2020-06-27 19:52:04 +0300, Laurent Pinchart wrote:\n> Hi Niklas,\n> \n> Thank you for the patch.\n> \n> On Sat, Jun 27, 2020 at 05:00:43AM +0200, Niklas Söderlund wrote:\n> > The struct ImgUOutput now only contains one member that are in use, the\n> > video device. Remove the struct and use the video device directly\n> > instead.\n> > \n> > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> > ---\n> >  src/libcamera/pipeline/ipu3/imgu.cpp | 55 ++++++++++++----------------\n> >  src/libcamera/pipeline/ipu3/imgu.h   | 25 ++++---------\n> >  src/libcamera/pipeline/ipu3/ipu3.cpp | 12 +++---\n> >  3 files changed, 37 insertions(+), 55 deletions(-)\n> > \n> > diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\n> > index d54e844d9bfc5147..a601ca3fa2b1803f 100644\n> > --- a/src/libcamera/pipeline/ipu3/imgu.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n> > @@ -55,31 +55,22 @@ int ImgUDevice::init(MediaDevice *media, unsigned int index)\n> >  \tif (ret)\n> >  \t\treturn ret;\n> >  \n> > -\toutput_.dev = V4L2VideoDevice::fromEntityName(media, name_ + \" output\");\n> > -\tret = output_.dev->open();\n> > +\toutput_ = V4L2VideoDevice::fromEntityName(media, name_ + \" output\");\n> > +\tret = output_->open();\n> >  \tif (ret)\n> >  \t\treturn ret;\n> >  \n> > -\toutput_.pad = PAD_OUTPUT;\n> > -\toutput_.name = \"output\";\n> > -\n> > -\tviewfinder_.dev = V4L2VideoDevice::fromEntityName(media,\n> > +\tviewfinder_ = V4L2VideoDevice::fromEntityName(media,\n> >  \t\t\t\t\t\t\t  name_ + \" viewfinder\");\n> \n> Wrong indentation.\n> \n> > -\tret = viewfinder_.dev->open();\n> > +\tret = viewfinder_->open();\n> >  \tif (ret)\n> >  \t\treturn ret;\n> >  \n> > -\tviewfinder_.pad = PAD_VF;\n> > -\tviewfinder_.name = \"viewfinder\";\n> > -\n> > -\tstat_.dev = V4L2VideoDevice::fromEntityName(media, name_ + \" 3a stat\");\n> > -\tret = stat_.dev->open();\n> > +\tstat_ = V4L2VideoDevice::fromEntityName(media, name_ + \" 3a stat\");\n> > +\tret = stat_->open();\n> >  \tif (ret)\n> >  \t\treturn ret;\n> >  \n> > -\tstat_.pad = PAD_STAT;\n> > -\tstat_.name = \"stat\";\n> > -\n> >  \treturn 0;\n> >  }\n> >  \n> > @@ -142,19 +133,19 @@ int ImgUDevice::configureInput(const Size &size,\n> >  int ImgUDevice::configureOutput(const StreamConfiguration &cfg,\n> >  \t\t\t\tV4L2DeviceFormat *outputFormat)\n> >  {\n> > -\treturn configureVideoDevice(output_.dev, PAD_OUTPUT, cfg, outputFormat);\n> > +\treturn configureVideoDevice(output_, PAD_OUTPUT, cfg, outputFormat);\n> >  }\n> >  \n> >  int ImgUDevice::configureViewfinder(const StreamConfiguration &cfg,\n> >  \t\t\t\t    V4L2DeviceFormat *outputFormat)\n> >  {\n> > -\treturn configureVideoDevice(viewfinder_.dev, PAD_VF, cfg, outputFormat);\n> > +\treturn configureVideoDevice(viewfinder_, PAD_VF, cfg, outputFormat);\n> >  }\n> >  \n> >  int ImgUDevice::configureStat(const StreamConfiguration &cfg,\n> >  \t\t\t      V4L2DeviceFormat *outputFormat)\n> >  {\n> > -\treturn configureVideoDevice(stat_.dev, PAD_STAT, cfg, outputFormat);\n> > +\treturn configureVideoDevice(stat_, PAD_STAT, cfg, outputFormat);\n> >  }\n> >  \n> >  int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n> > @@ -170,7 +161,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n> >  \t\treturn ret;\n> >  \n> >  \t/* No need to apply format to the stat node. */\n> > -\tif (dev == stat_.dev)\n> > +\tif (dev == stat_)\n> >  \t\treturn 0;\n> >  \n> >  \t*outputFormat = {};\n> > @@ -182,7 +173,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n> >  \tif (ret)\n> >  \t\treturn ret;\n> >  \n> > -\tconst char *name = dev == output_.dev ? \"output\" : \"viewfinder\";\n> > +\tconst char *name = dev == output_ ? \"output\" : \"viewfinder\";\n> >  \tLOG(IPU3, Debug) << \"ImgU \" << name << \" format = \"\n> >  \t\t\t << outputFormat->toString();\n> >  \n> > @@ -208,19 +199,19 @@ int ImgUDevice::allocateBuffers(unsigned int bufferCount)\n> >  \t *\n> >  \t * \\todo To be revised when we'll actually use the stat node.\n> >  \t */\n> > -\tret = stat_.dev->importBuffers(bufferCount);\n> > +\tret = stat_->importBuffers(bufferCount);\n> >  \tif (ret < 0) {\n> >  \t\tLOG(IPU3, Error) << \"Failed to allocate ImgU stat buffers\";\n> >  \t\tgoto error;\n> >  \t}\n> >  \n> > -\tret = output_.dev->importBuffers(bufferCount);\n> > +\tret = output_->importBuffers(bufferCount);\n> >  \tif (ret < 0) {\n> >  \t\tLOG(IPU3, Error) << \"Failed to import ImgU output buffers\";\n> >  \t\tgoto error;\n> >  \t}\n> >  \n> > -\tret = viewfinder_.dev->importBuffers(bufferCount);\n> > +\tret = viewfinder_->importBuffers(bufferCount);\n> >  \tif (ret < 0) {\n> >  \t\tLOG(IPU3, Error) << \"Failed to import ImgU viewfinder buffers\";\n> >  \t\tgoto error;\n> > @@ -241,15 +232,15 @@ void ImgUDevice::freeBuffers()\n> >  {\n> >  \tint ret;\n> >  \n> > -\tret = output_.dev->releaseBuffers();\n> > +\tret = output_->releaseBuffers();\n> >  \tif (ret)\n> >  \t\tLOG(IPU3, Error) << \"Failed to release ImgU output buffers\";\n> >  \n> > -\tret = stat_.dev->releaseBuffers();\n> > +\tret = stat_->releaseBuffers();\n> >  \tif (ret)\n> >  \t\tLOG(IPU3, Error) << \"Failed to release ImgU stat buffers\";\n> >  \n> > -\tret = viewfinder_.dev->releaseBuffers();\n> > +\tret = viewfinder_->releaseBuffers();\n> >  \tif (ret)\n> >  \t\tLOG(IPU3, Error) << \"Failed to release ImgU viewfinder buffers\";\n> >  \n> > @@ -263,19 +254,19 @@ int ImgUDevice::start()\n> >  \tint ret;\n> >  \n> >  \t/* Start the ImgU video devices. */\n> > -\tret = output_.dev->streamOn();\n> > +\tret = output_->streamOn();\n> >  \tif (ret) {\n> >  \t\tLOG(IPU3, Error) << \"Failed to start ImgU output\";\n> >  \t\treturn ret;\n> >  \t}\n> >  \n> > -\tret = viewfinder_.dev->streamOn();\n> > +\tret = viewfinder_->streamOn();\n> >  \tif (ret) {\n> >  \t\tLOG(IPU3, Error) << \"Failed to start ImgU viewfinder\";\n> >  \t\treturn ret;\n> >  \t}\n> >  \n> > -\tret = stat_.dev->streamOn();\n> > +\tret = stat_->streamOn();\n> >  \tif (ret) {\n> >  \t\tLOG(IPU3, Error) << \"Failed to start ImgU stat\";\n> >  \t\treturn ret;\n> > @@ -294,9 +285,9 @@ int ImgUDevice::stop()\n> >  {\n> >  \tint ret;\n> >  \n> > -\tret = output_.dev->streamOff();\n> > -\tret |= viewfinder_.dev->streamOff();\n> > -\tret |= stat_.dev->streamOff();\n> > +\tret = output_->streamOff();\n> > +\tret |= viewfinder_->streamOff();\n> > +\tret |= stat_->streamOff();\n> >  \tret |= input_->streamOff();\n> >  \n> >  \treturn ret;\n> > diff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h\n> > index f8fd54089753b40e..2ac77ce5719f88f1 100644\n> > --- a/src/libcamera/pipeline/ipu3/imgu.h\n> > +++ b/src/libcamera/pipeline/ipu3/imgu.h\n> > @@ -24,28 +24,19 @@ struct StreamConfiguration;\n> >  class ImgUDevice\n> >  {\n> >  public:\n> > -\t/* ImgU output descriptor: group data specific to an ImgU output. */\n> > -\tstruct ImgUOutput {\n> > -\t\tV4L2VideoDevice *dev;\n> > -\t\tunsigned int pad;\n> > -\t\tstd::string name;\n> > -\t};\n> > -\n> >  \tImgUDevice()\n> > -\t\t: imgu_(nullptr), input_(nullptr)\n> > +\t\t: imgu_(nullptr), input_(nullptr), output_(nullptr),\n> > +\t\t  viewfinder_(nullptr), stat_(nullptr)\n> >  \t{\n> > -\t\toutput_.dev = nullptr;\n> > -\t\tviewfinder_.dev = nullptr;\n> > -\t\tstat_.dev = nullptr;\n> >  \t}\n> >  \n> >  \t~ImgUDevice()\n> >  \t{\n> >  \t\tdelete imgu_;\n> >  \t\tdelete input_;\n> > -\t\tdelete output_.dev;\n> > -\t\tdelete viewfinder_.dev;\n> > -\t\tdelete stat_.dev;\n> > +\t\tdelete output_;\n> > +\t\tdelete viewfinder_;\n> > +\t\tdelete stat_;\n> >  \t}\n> >  \n> >  \tint init(MediaDevice *media, unsigned int index);\n> > @@ -68,9 +59,9 @@ public:\n> >  \n> >  \tV4L2Subdevice *imgu_;\n> >  \tV4L2VideoDevice *input_;\n> > -\tImgUOutput output_;\n> > -\tImgUOutput viewfinder_;\n> > -\tImgUOutput stat_;\n> > +\tV4L2VideoDevice *output_;\n> > +\tV4L2VideoDevice *viewfinder_;\n> > +\tV4L2VideoDevice *stat_;\n> \n> You could turn these into unique_ptr to simplify the constructor and\n> destructor.\n\nGood idea, I will add a patch for v2 to do just that.\n\n> \n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> \n> >  \t/* \\todo Add param video device for 3A tuning */\n> >  \n> >  private:\n> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > index 6ae4728b470f9487..c25bcaaeb5fb813f 100644\n> > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > @@ -561,9 +561,9 @@ int PipelineHandlerIPU3::exportFrameBuffers(Camera *camera, Stream *stream,\n> >  \tunsigned int count = stream->configuration().bufferCount;\n> >  \n> >  \tif (stream == &data->outStream_)\n> > -\t\treturn data->imgu_.output_.dev->exportBuffers(count, buffers);\n> > +\t\treturn data->imgu_.output_->exportBuffers(count, buffers);\n> >  \telse if (stream == &data->vfStream_)\n> > -\t\treturn data->imgu_.viewfinder_.dev->exportBuffers(count, buffers);\n> > +\t\treturn data->imgu_.viewfinder_->exportBuffers(count, buffers);\n> >  \telse if (stream == &data->rawStream_)\n> >  \t\treturn data->cio2_.exportBuffers(count, buffers);\n> >  \n> > @@ -678,9 +678,9 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n> >  \t\tint ret;\n> >  \n> >  \t\tif (stream == &data->outStream_)\n> > -\t\t\tret = data->imgu_.output_.dev->queueBuffer(buffer);\n> > +\t\t\tret = data->imgu_.output_->queueBuffer(buffer);\n> >  \t\telse if (stream == &data->vfStream_)\n> > -\t\t\tret = data->imgu_.viewfinder_.dev->queueBuffer(buffer);\n> > +\t\t\tret = data->imgu_.viewfinder_->queueBuffer(buffer);\n> >  \t\telse\n> >  \t\t\tcontinue;\n> >  \n> > @@ -802,9 +802,9 @@ int PipelineHandlerIPU3::registerCameras()\n> >  \t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n> >  \t\tdata->imgu_.input_->bufferReady.connect(&data->cio2_,\n> >  \t\t\t\t\t&CIO2Device::tryReturnBuffer);\n> > -\t\tdata->imgu_.output_.dev->bufferReady.connect(data.get(),\n> > +\t\tdata->imgu_.output_->bufferReady.connect(data.get(),\n> >  \t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n> > -\t\tdata->imgu_.viewfinder_.dev->bufferReady.connect(data.get(),\n> > +\t\tdata->imgu_.viewfinder_->bufferReady.connect(data.get(),\n> >  \t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n> >  \n> >  \t\t/* Create and register the Camera instance. */\n> \n> -- \n> Regards,\n> \n> Laurent Pinchart","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 B9798C2E66\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 27 Jun 2020 23:47:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1EF07609C8;\n\tSun, 28 Jun 2020 01:47:51 +0200 (CEST)","from mail-lj1-x242.google.com (mail-lj1-x242.google.com\n\t[IPv6:2a00:1450:4864:20::242])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F14EA609A9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 28 Jun 2020 01:47:49 +0200 (CEST)","by mail-lj1-x242.google.com with SMTP id n23so14067035ljh.7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 27 Jun 2020 16:47:49 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tj19sm3568749ljg.28.2020.06.27.16.47.48\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 27 Jun 2020 16:47:48 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"KZLNlFGJ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=TFMPua5faqghVFdfYBxJtLQDwXYJdqkq9GceaakVHfM=;\n\tb=KZLNlFGJ2buOav8oRbu30/TbuxNb8lZ2HQJASjLXliS4F91bGgIBZxdtGQt012lWo8\n\tUePACu4w6tY93VsnWRo0Dpei3WgnBlHesakywAVqPk6ueKQTctEtWWY9ftxFw5VCiQWK\n\tt12lekV9w+3K5xjIPh+olLOtM7414k3zyV8WLvGxITEtotuorjbWqOXnrX/TGgUPAWVW\n\tcyJy0YTsBKybTZzp1GSHfKfH1NN8IlubqvQMQbRiVW7/BTwWWg8HjCCLcwApzF6j63gi\n\tDzEf+a6JfW+igRaqw2ebJ5VIrUcAgLg2/6LAQ2auQ4VYchzisTepIunj0MSe/DFuYIwQ\n\t7bZA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=TFMPua5faqghVFdfYBxJtLQDwXYJdqkq9GceaakVHfM=;\n\tb=F9CgxN0BA2oKlUCnPreDUuX3IC7t1KP/sEwEdl7p3wElpcanSGi7OfycLaA8wNPo1E\n\tm1sd2wFn4spVzGwCwZ86Bemyeujcgdzsl/Tx3z1bNp4U8OZuOHgs8b6+66d5U5lMVYfY\n\tUmjm1FGs5vCNOZdlz+xusXdVwGW3RN4s1onU4MNqKjuctsK8c/jGw9RF/j5N0K1UblZX\n\tRLqgrMUMXAB9mWapQkQWElwjVj1QMgm2XCKWjVThhKByLZarQvpJaLZP8brlodwXCNSv\n\t1/PmY8qSBn9hVXRbUATd4IAmiaThRAbPJ9Xc4uLji+HkXXOBhFS1XRKMO/WOqmDxNvyZ\n\trkYQ==","X-Gm-Message-State":"AOAM533lzQQZJU8MeeCYp+dsAErq4Z/zJa6cyza1UMMf7YmbmW7XKL7a\n\tHIZIThhcLfPrs1uAHGYiadvdWA==","X-Google-Smtp-Source":"ABdhPJy2ojy8YR81GbRTtu22nhOSjj9kBP03IH02ieOu2qGFt34s0xSbEZQmFtR5d1VO8JYDVlUr3A==","X-Received":"by 2002:a2e:a317:: with SMTP id\n\tl23mr4952552lje.175.1593301669201; \n\tSat, 27 Jun 2020 16:47:49 -0700 (PDT)","Date":"Sun, 28 Jun 2020 01:47:47 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Message-ID":"<20200627234747.GE1105424@oden.dyn.berto.se>","References":"<20200627030043.2088585-1-niklas.soderlund@ragnatech.se>\n\t<20200627030043.2088585-14-niklas.soderlund@ragnatech.se>\n\t<20200627165204.GK5966@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200627165204.GK5966@pendragon.ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 13/13] libcamera: ipu3: imgu: Remove\n\tImgUOutput","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]