[{"id":4968,"web_url":"https://patchwork.libcamera.org/comment/4968/","msgid":"<20200602132820.54d2ttc2d3lmbecj@uno.localdomain>","date":"2020-06-02T13:28:20","subject":"Re: [libcamera-devel] [PATCH 10/10] libcamera: ipu3: Allow\n\tzero-copy RAW stream capture","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas,\n\nnot my strongest experties area, but I only have two minor remarks on\nthis one.\n\nOn Tue, Jun 02, 2020 at 03:39:09AM +0200, Niklas Söderlund wrote:\n> With the refactored CIO2 interface it's now easy to add zero-copy for\n> buffers in the RAW stream. Use the internally allocated buffers inside\n> the CIO2Device if no buffer for the RAW stream is provided by the\n> application, or use the application provided one if one is.\n\ns/if one is./if any./\n\n>\n> Signed-off-by: Niklas Söderlund \n> ---\n> src/libcamera/pipeline/ipu3/cio2.cpp | 52 +++++++++++--------\n> src/libcamera/pipeline/ipu3/cio2.h | 6 +--\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 76 +++++++++++-----------------\n> 3 files changed, 62 insertions(+), 72 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\n> index 895848d2b3a1fba9..bbf18910c0e7abd4 100644\n> --- a/src/libcamera/pipeline/ipu3/cio2.cpp\n> +++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n> @@ -205,31 +205,16 @@ int CIO2Device::exportBuffers(unsigned int count,\n> \treturn output_->exportBuffers(count, buffers);\n> }\n>\n> -FrameBuffer *CIO2Device::getBuffer()\n> -{\n> -\tif (availableBuffers_.empty()) {\n> -\t\tLOG(IPU3, Error) << \"CIO2 buffer underrun\";\n> -\t\treturn nullptr;\n> -\t}\n> -\n> -\tFrameBuffer *buffer = availableBuffers_.front();\n> -\n> -\tavailableBuffers_.pop();\n> -\n> -\treturn buffer;\n> -}\n> -\n> -void CIO2Device::putBuffer(FrameBuffer *buffer)\n> -{\n> -\tavailableBuffers_.push(buffer);\n> -}\n> -\n> int CIO2Device::start()\n> {\n> -\tint ret = output_->allocateBuffers(CIO2_BUFFER_COUNT, &buffers_);\n> +\tint ret = output_->exportBuffers(CIO2_BUFFER_COUNT, &buffers_);\n> \tif (ret < 0)\n> \t\treturn ret;\n>\n> +\tret = output_->importBuffers(CIO2_BUFFER_COUNT);\n> +\tif (ret)\n> +\t\tLOG(IPU3, Error) << \"Failed to import CIO2 buffers\";\n> +\n> \tfor (std::unique_ptr &buffer : buffers_)\n> \t\tavailableBuffers_.push(buffer.get());\n>\n> @@ -253,11 +238,36 @@ int CIO2Device::stop()\n> \treturn ret;\n> }\n>\n> -int CIO2Device::queueBuffer(FrameBuffer *buffer)\n> +int CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)\n> {\n> +\tFrameBuffer *buffer = rawBuffer;\n> +\n> +\t/* If no buffer provided in request, use an internal one. */\n> +\tif (!buffer) {\n> +\t\tif (availableBuffers_.empty()) {\n> +\t\t\tLOG(IPU3, Error) << \"CIO2 buffer underrun\";\n> +\t\t\treturn -EINVAL;\n> +\t\t}\n> +\n> +\t\tbuffer = availableBuffers_.front();\n> +\t\tavailableBuffers_.pop();\n> +\t}\n> +\n> +\tbuffer->setRequest(request);\n> +\n> \treturn output_->queueBuffer(buffer);\n> }\n>\n> +void CIO2Device::tryReturnBuffer(FrameBuffer *buffer)\n> +{\n> +\tfor (const std::unique_ptr &buf : buffers_) {\n> +\t\tif (buf.get() == buffer) {\n> +\t\t\tavailableBuffers_.push(buffer);\n> +\t\t\tbreak;\n> +\t\t}\n> +\t}\n> +}\n> +\n> V4L2PixelFormat CIO2Device::mediaBusToFormat(unsigned int code)\n> {\n> \tswitch (code) {\n> diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\n> index 032b91c082889a63..1a9b700bf4e7e15c 100644\n> --- a/src/libcamera/pipeline/ipu3/cio2.h\n> +++ b/src/libcamera/pipeline/ipu3/cio2.h\n> @@ -47,9 +47,6 @@ public:\n> \tint exportBuffers(unsigned int count,\n> \t\t\t std::vector> *buffers);\n>\n> -\tFrameBuffer *getBuffer();\n> -\tvoid putBuffer(FrameBuffer *buffer);\n> -\n> \tint start();\n> \tint stop();\n>\n> @@ -57,7 +54,8 @@ public:\n> \tSize resolution() const { return sensor_->resolution(); }\n> \tControlList properties() const { return sensor_->properties(); }\n>\n> -\tint queueBuffer(FrameBuffer *buffer);\n> +\tint queueBuffer(Request *request, FrameBuffer *rawBuffer);\n> +\tvoid tryReturnBuffer(FrameBuffer *buffer);\n> \tSignal bufferReady;\n>\n> private:\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 636c1c54627b5777..03e954d0f30d39cc 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -121,7 +121,6 @@ public:\n> \t}\n>\n> \tvoid imguOutputBufferReady(FrameBuffer *buffer);\n> -\tvoid imguInputBufferReady(FrameBuffer *buffer);\n> \tvoid cio2BufferReady(FrameBuffer *buffer);\n>\n> \tCIO2Device cio2_;\n> @@ -730,25 +729,31 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n> int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n> {\n> \tIPU3CameraData *data = cameraData(camera);\n> -\tFrameBuffer *buffer;\n> \tint error = 0;\n>\n> -\t/* Get a CIO2 buffer, associate it with the request and queue it. */\n> -\tbuffer = data->cio2_.getBuffer();\n> -\tif (!buffer)\n> -\t\treturn -EINVAL;\n> +\t/* Search for a RAW buffer in the request, if any. */\n> +\tFrameBuffer *rawBuffer = nullptr;\n> +\tfor (auto it : request->buffers()) {\n> +\t\tIPU3Stream *stream = static_cast(it.first);\n> +\t\tif (!stream->raw_)\n> +\t\t\tcontinue;\n>\n> -\tbuffer->setRequest(request);\n> -\tdata->cio2_.queueBuffer(buffer);\n> +\t\trawBuffer = it.second;\n> +\t\tbreak;\n> +\t}\n>\n> +\t/* Queue a buffer on the CIO2, the buffer may come from the request. */\n> +\terror = data->cio2_.queueBuffer(request, rawBuffer);\n> +\tif (error)\n> +\t\treturn error;\n> +\n> +\t/* Queue all buffers from the request aimed for the ImgU. */\n> \tfor (auto it : request->buffers()) {\n> \t\tIPU3Stream *stream = static_cast(it.first);\n> -\t\tbuffer = it.second;\n> -\n> -\t\t/* Skip raw streams, they are copied from the CIO2 buffer. */\n> \t\tif (stream->raw_)\n> \t\t\tcontinue;\n>\n> +\t\tFrameBuffer *buffer = it.second;\n> \t\tint ret = stream->device_->dev->queueBuffer(buffer);\n> \t\tif (ret < 0)\n> \t\t\terror = ret;\n> @@ -878,8 +883,8 @@ int PipelineHandlerIPU3::registerCameras()\n> \t\t */\n> \t\tdata->cio2_.bufferReady.connect(data.get(),\n> \t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n> -\t\tdata->imgu_->input_->bufferReady.connect(data.get(),\n> -\t\t\t\t\t&IPU3CameraData::imguInputBufferReady);\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\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n> \t\tdata->imgu_->viewfinder_.dev->bufferReady.connect(data.get(),\n> @@ -908,22 +913,6 @@ int PipelineHandlerIPU3::registerCameras()\n> * Buffer Ready slots\n> */\n>\n> -/**\n> - * \\brief Handle buffers completion at the ImgU input\n> - * \\param[in] buffer The completed buffer\n> - *\n> - * Buffers completed from the ImgU input are immediately queued back to the\n> - * CIO2 unit to continue frame capture.\n> - */\n> -void IPU3CameraData::imguInputBufferReady(FrameBuffer *buffer)\n> -{\n> -\t/* \\todo Handle buffer failures when state is set to BufferError. */\n> -\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n> -\t\treturn;\n> -\n> -\tcio2_.putBuffer(buffer);\n> -}\n> -\n> /**\n> * \\brief Handle buffers completion at the ImgU output\n> * \\param[in] buffer The completed buffer\n> @@ -956,27 +945,20 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n> \t\treturn;\n>\n> \tRequest *request = buffer->request();\n> -\tFrameBuffer *raw = request->findBuffer(&rawStream_);\n>\n> -\tif (!raw) {\n> -\t\t/* No RAW buffers present, just queue to IMGU. */\n> -\t\timgu_->input_->queueBuffer(buffer);\n> -\t\treturn;\n> -\t}\n> -\n> -\t/* RAW buffers present, special care is needed. */\n> -\tif (request->buffers().size() > 1)\n> -\t\timgu_->input_->queueBuffer(buffer);\n> -\n> -\tif (raw->copyFrom(buffer))\n> -\t\tLOG(IPU3, Debug) << \"Copy of FrameBuffer failed\";\n> -\n> -\tpipe_->completeBuffer(camera_, request, raw);\n> -\n> -\tif (request->buffers().size() == 1) {\n> -\t\tcio2_.putBuffer(buffer);\n> +\t/*\n> +\t * If the requests contains a buffer for the RAW stream and the buffer\n> +\t * completed by the CIO2 satisfy all pending buffers in the request\n\ns/satisfy/satisfies\n\nThe rest looks good\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> +\t * complete the request now, there is no need for this request to be\n> +\t * processed by the ImGU.\n> +\t */\n> +\tif (request->findBuffer(&rawStream_) &&\n> +\t pipe_->completeBuffer(camera_, request, buffer)) {\n> \t\tpipe_->completeRequest(camera_, request);\n> +\t\treturn;\n> \t}\n> +\n> +\timgu_->input_->queueBuffer(buffer);\n> }\n>\n> /* -----------------------------------------------------------------------------\n> --\n> 2.26.2\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 relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8390661012\n\tfor ;\n\tTue, 2 Jun 2020 15:25:00 +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 relay1-d.mail.gandi.net (Postfix) with ESMTPSA id EE858240008;\n\tTue, 2 Jun 2020 13:24:59 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Tue, 2 Jun 2020 15:28:20 +0200","From":"Jacopo Mondi ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200602132820.54d2ttc2d3lmbecj@uno.localdomain>","References":"<20200602013909.3170593-1-niklas.soderlund@ragnatech.se>\n\t<20200602013909.3170593-11-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200602013909.3170593-11-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH 10/10] libcamera: ipu3: Allow\n\tzero-copy RAW stream capture","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, 02 Jun 2020 13:25:00 -0000"}},{"id":5074,"web_url":"https://patchwork.libcamera.org/comment/5074/","msgid":"<20200605225644.GM26752@pendragon.ideasonboard.com>","date":"2020-06-05T22:56:44","subject":"Re: [libcamera-devel] [PATCH 10/10] libcamera: ipu3: Allow\n\tzero-copy RAW stream capture","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 Tue, Jun 02, 2020 at 03:28:20PM +0200, Jacopo Mondi wrote:\n> Hi Niklas,\n> \n> not my strongest experties area, but I only have two minor remarks on\n> this one.\n> \n> On Tue, Jun 02, 2020 at 03:39:09AM +0200, Niklas Söderlund wrote:\n> > With the refactored CIO2 interface it's now easy to add zero-copy for\n> > buffers in the RAW stream. Use the internally allocated buffers inside\n> > the CIO2Device if no buffer for the RAW stream is provided by the\n> > application, or use the application provided one if one is.\n> \n> s/if one is./if any./\n\n\"or use the application-provided buffer if any.\"\n\n> >\n> > Signed-off-by: Niklas Söderlund \n> > ---\n> > src/libcamera/pipeline/ipu3/cio2.cpp | 52 +++++++++++--------\n> > src/libcamera/pipeline/ipu3/cio2.h | 6 +--\n> > src/libcamera/pipeline/ipu3/ipu3.cpp | 76 +++++++++++-----------------\n> > 3 files changed, 62 insertions(+), 72 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\n> > index 895848d2b3a1fba9..bbf18910c0e7abd4 100644\n> > --- a/src/libcamera/pipeline/ipu3/cio2.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n> > @@ -205,31 +205,16 @@ int CIO2Device::exportBuffers(unsigned int count,\n> > \treturn output_->exportBuffers(count, buffers);\n> > }\n> >\n> > -FrameBuffer *CIO2Device::getBuffer()\n> > -{\n> > -\tif (availableBuffers_.empty()) {\n> > -\t\tLOG(IPU3, Error) << \"CIO2 buffer underrun\";\n> > -\t\treturn nullptr;\n> > -\t}\n> > -\n> > -\tFrameBuffer *buffer = availableBuffers_.front();\n> > -\n> > -\tavailableBuffers_.pop();\n> > -\n> > -\treturn buffer;\n> > -}\n> > -\n> > -void CIO2Device::putBuffer(FrameBuffer *buffer)\n> > -{\n> > -\tavailableBuffers_.push(buffer);\n> > -}\n> > -\n> > int CIO2Device::start()\n> > {\n> > -\tint ret = output_->allocateBuffers(CIO2_BUFFER_COUNT, &buffers_);\n> > +\tint ret = output_->exportBuffers(CIO2_BUFFER_COUNT, &buffers_);\n> > \tif (ret < 0)\n> > \t\treturn ret;\n> >\n> > +\tret = output_->importBuffers(CIO2_BUFFER_COUNT);\n> > +\tif (ret)\n> > +\t\tLOG(IPU3, Error) << \"Failed to import CIO2 buffers\";\n> > +\n> > \tfor (std::unique_ptr &buffer : buffers_)\n> > \t\tavailableBuffers_.push(buffer.get());\n> >\n> > @@ -253,11 +238,36 @@ int CIO2Device::stop()\n> > \treturn ret;\n> > }\n> >\n> > -int CIO2Device::queueBuffer(FrameBuffer *buffer)\n> > +int CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)\n> > {\n> > +\tFrameBuffer *buffer = rawBuffer;\n> > +\n> > +\t/* If no buffer provided in request, use an internal one. */\n\ns/provided/is provided/\ns/request/the request/\n\n> > +\tif (!buffer) {\n> > +\t\tif (availableBuffers_.empty()) {\n> > +\t\t\tLOG(IPU3, Error) << \"CIO2 buffer underrun\";\n> > +\t\t\treturn -EINVAL;\n> > +\t\t}\n> > +\n> > +\t\tbuffer = availableBuffers_.front();\n> > +\t\tavailableBuffers_.pop();\n> > +\t}\n> > +\n> > +\tbuffer->setRequest(request);\n> > +\n> > \treturn output_->queueBuffer(buffer);\n> > }\n> >\n> > +void CIO2Device::tryReturnBuffer(FrameBuffer *buffer)\n> > +{\n> > +\tfor (const std::unique_ptr &buf : buffers_) {\n> > +\t\tif (buf.get() == buffer) {\n> > +\t\t\tavailableBuffers_.push(buffer);\n> > +\t\t\tbreak;\n> > +\t\t}\n> > +\t}\n\nI believe this will be a common need. Should the FrameBuffer class be\nextended with an internal (or external) bool flag ? Or a void *owner (a\nbit of a hack) ? Or something similar but better ? Bonus points if the\nAPI to do so can be hidden from applications.\n\n> > +}\n> > +\n> > V4L2PixelFormat CIO2Device::mediaBusToFormat(unsigned int code)\n> > {\n> > \tswitch (code) {\n> > diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\n> > index 032b91c082889a63..1a9b700bf4e7e15c 100644\n> > --- a/src/libcamera/pipeline/ipu3/cio2.h\n> > +++ b/src/libcamera/pipeline/ipu3/cio2.h\n> > @@ -47,9 +47,6 @@ public:\n> > \tint exportBuffers(unsigned int count,\n> > \t\t\t std::vector> *buffers);\n> >\n> > -\tFrameBuffer *getBuffer();\n> > -\tvoid putBuffer(FrameBuffer *buffer);\n> > -\n> > \tint start();\n> > \tint stop();\n> >\n> > @@ -57,7 +54,8 @@ public:\n> > \tSize resolution() const { return sensor_->resolution(); }\n> > \tControlList properties() const { return sensor_->properties(); }\n> >\n> > -\tint queueBuffer(FrameBuffer *buffer);\n> > +\tint queueBuffer(Request *request, FrameBuffer *rawBuffer);\n> > +\tvoid tryReturnBuffer(FrameBuffer *buffer);\n> > \tSignal bufferReady;\n> >\n> > private:\n> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > index 636c1c54627b5777..03e954d0f30d39cc 100644\n> > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > @@ -121,7 +121,6 @@ public:\n> > \t}\n> >\n> > \tvoid imguOutputBufferReady(FrameBuffer *buffer);\n> > -\tvoid imguInputBufferReady(FrameBuffer *buffer);\n> > \tvoid cio2BufferReady(FrameBuffer *buffer);\n> >\n> > \tCIO2Device cio2_;\n> > @@ -730,25 +729,31 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n> > int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n> > {\n> > \tIPU3CameraData *data = cameraData(camera);\n> > -\tFrameBuffer *buffer;\n> > \tint error = 0;\n> >\n> > -\t/* Get a CIO2 buffer, associate it with the request and queue it. */\n> > -\tbuffer = data->cio2_.getBuffer();\n> > -\tif (!buffer)\n> > -\t\treturn -EINVAL;\n> > +\t/* Search for a RAW buffer in the request, if any. */\n> > +\tFrameBuffer *rawBuffer = nullptr;\n> > +\tfor (auto it : request->buffers()) {\n> > +\t\tIPU3Stream *stream = static_cast(it.first);\n> > +\t\tif (!stream->raw_)\n> > +\t\t\tcontinue;\n> >\n> > -\tbuffer->setRequest(request);\n> > -\tdata->cio2_.queueBuffer(buffer);\n> > +\t\trawBuffer = it.second;\n> > +\t\tbreak;\n> > +\t}\n\nCan't you use Request::findBuffer() ?\n\n> >\n> > +\t/* Queue a buffer on the CIO2, the buffer may come from the request. */\n> > +\terror = data->cio2_.queueBuffer(request, rawBuffer);\n\nHow about\n\n\t/*\n\t * Queue a buffer on the CIO2, using the raw stream buffer provided in\n\t * the request, if any, or a CIO2 internal buffer otherwise.\n\t */\n\tFrameBuffer *rawBuffer = request->findBuffer(&data->rawStream_);\n\terror = data->cio2_.queueBuffer(request, rawBuffer);\n\n> > +\tif (error)\n> > +\t\treturn error;\n> > +\n> > +\t/* Queue all buffers from the request aimed for the ImgU. */\n> > \tfor (auto it : request->buffers()) {\n> > \t\tIPU3Stream *stream = static_cast(it.first);\n> > -\t\tbuffer = it.second;\n> > -\n> > -\t\t/* Skip raw streams, they are copied from the CIO2 buffer. */\n> > \t\tif (stream->raw_)\n> > \t\t\tcontinue;\n> >\n> > +\t\tFrameBuffer *buffer = it.second;\n> > \t\tint ret = stream->device_->dev->queueBuffer(buffer);\n> > \t\tif (ret < 0)\n> > \t\t\terror = ret;\n> > @@ -878,8 +883,8 @@ int PipelineHandlerIPU3::registerCameras()\n> > \t\t */\n> > \t\tdata->cio2_.bufferReady.connect(data.get(),\n> > \t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n> > -\t\tdata->imgu_->input_->bufferReady.connect(data.get(),\n> > -\t\t\t\t\t&IPU3CameraData::imguInputBufferReady);\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\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n> > \t\tdata->imgu_->viewfinder_.dev->bufferReady.connect(data.get(),\n> > @@ -908,22 +913,6 @@ int PipelineHandlerIPU3::registerCameras()\n> > * Buffer Ready slots\n> > */\n> >\n> > -/**\n> > - * \\brief Handle buffers completion at the ImgU input\n> > - * \\param[in] buffer The completed buffer\n> > - *\n> > - * Buffers completed from the ImgU input are immediately queued back to the\n> > - * CIO2 unit to continue frame capture.\n> > - */\n> > -void IPU3CameraData::imguInputBufferReady(FrameBuffer *buffer)\n> > -{\n> > -\t/* \\todo Handle buffer failures when state is set to BufferError. */\n> > -\tif (buffer->metadata().status == FrameMetadata::FrameCancelled)\n> > -\t\treturn;\n\nWe're losing this, but I think it's actually not needed.\n\n> > -\n> > -\tcio2_.putBuffer(buffer);\n> > -}\n> > -\n> > /**\n> > * \\brief Handle buffers completion at the ImgU output\n> > * \\param[in] buffer The completed buffer\n> > @@ -956,27 +945,20 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n> > \t\treturn;\n> >\n> > \tRequest *request = buffer->request();\n> > -\tFrameBuffer *raw = request->findBuffer(&rawStream_);\n> >\n> > -\tif (!raw) {\n> > -\t\t/* No RAW buffers present, just queue to IMGU. */\n> > -\t\timgu_->input_->queueBuffer(buffer);\n> > -\t\treturn;\n> > -\t}\n> > -\n> > -\t/* RAW buffers present, special care is needed. */\n> > -\tif (request->buffers().size() > 1)\n> > -\t\timgu_->input_->queueBuffer(buffer);\n> > -\n> > -\tif (raw->copyFrom(buffer))\n> > -\t\tLOG(IPU3, Debug) << \"Copy of FrameBuffer failed\";\n> > -\n> > -\tpipe_->completeBuffer(camera_, request, raw);\n> > -\n> > -\tif (request->buffers().size() == 1) {\n> > -\t\tcio2_.putBuffer(buffer);\n> > +\t/*\n> > +\t * If the requests contains a buffer for the RAW stream and the buffer\n> > +\t * completed by the CIO2 satisfy all pending buffers in the request\n> \n> s/satisfy/satisfies\n> \n> The rest looks good\n> \n> Reviewed-by: Jacopo Mondi \n> \n> > +\t * complete the request now, there is no need for this request to be\n> > +\t * processed by the ImGU.\n> > +\t */\n> > +\tif (request->findBuffer(&rawStream_) &&\n> > +\t pipe_->completeBuffer(camera_, request, buffer)) {\n> > \t\tpipe_->completeRequest(camera_, request);\n> > +\t\treturn;\n> > \t}\n\nI find the comment a bit hard to parse. How about the following ?\n\n\t/*\n\t * If the request contains a buffer for the RAW stream only, complete it\n\t * now as there's no need for ImgU processing.\n\t */\n\n> > +\n> > +\timgu_->input_->queueBuffer(buffer);\n> > }\n> >\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 0997D603C8\n\tfor ;\n\tSat, 6 Jun 2020 00:57:04 +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 65E7F27C;\n\tSat, 6 Jun 2020 00:57:03 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"P+9O25k5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1591397823;\n\tbh=CtT9As9LCdK65sCVvRpyRapMjtOXRouDqO+nYl9nUHI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=P+9O25k5f9G21+WmKL4x9HSu3YQ0W2PMWdZSamMU4COiuUp1sQUEq53I5amES6MHH\n\tyueYhTQOPO7rEyeh8YbCp5cvQA/C3cm4XiLn0QFXF5k0ONmzAqsZytzCPqskmPwe+O\n\tuzXDCMdpuZWtZReUm+SdAJlDTvX/+kQYwR/dHsG8=","Date":"Sat, 6 Jun 2020 01:56:44 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","Message-ID":"<20200605225644.GM26752@pendragon.ideasonboard.com>","References":"<20200602013909.3170593-1-niklas.soderlund@ragnatech.se>\n\t<20200602013909.3170593-11-niklas.soderlund@ragnatech.se>\n\t<20200602132820.54d2ttc2d3lmbecj@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200602132820.54d2ttc2d3lmbecj@uno.localdomain>","Subject":"Re: [libcamera-devel] [PATCH 10/10] libcamera: ipu3: Allow\n\tzero-copy RAW stream capture","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":"Fri, 05 Jun 2020 22:57:04 -0000"}}]