[{"id":15254,"web_url":"https://patchwork.libcamera.org/comment/15254/","msgid":"","date":"2021-02-19T17:33:23","subject":"Re: [libcamera-devel] [PATCH 08/20] libcamera: pipeline: simple:\n\tconverter: Decouple input and output completion","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 31/01/2021 22:46, Laurent Pinchart wrote:\n> The SimpleConverter API signals completion of input and output buffer\n> pairs. This unnecessarily delays requeueing the input buffer to the\n> video capture queue until the output buffer completes, and also delays\n> signalling request completion until the input buffer completes. While\n> this shouldn't cause large delays in practice, it will also not scale\n> when multi-stream support will be added to the converter class.\n> \n> To address the current issue and prepare for the future, decouple\n> signalling of input and output buffers completion.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/pipeline/simple/converter.cpp | 24 +++++--------------\n> src/libcamera/pipeline/simple/converter.h | 11 ++++-----\n> src/libcamera/pipeline/simple/simple.cpp | 26 +++++++++++++--------\n> 3 files changed, 26 insertions(+), 35 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> index f782fbc63b09..8324baedc198 100644\n> --- a/src/libcamera/pipeline/simple/converter.cpp\n> +++ b/src/libcamera/pipeline/simple/converter.cpp\n> @@ -45,8 +45,8 @@ SimpleConverter::SimpleConverter(MediaDevice *media)\n> \t\treturn;\n> \t}\n> \n> -\tm2m_->output()->bufferReady.connect(this, &SimpleConverter::outputBufferReady);\n> -\tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::captureBufferReady);\n> +\tm2m_->output()->bufferReady.connect(this, &SimpleConverter::m2mInputBufferReady);\n> +\tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::m2mOutputBufferReady);\n> }\n> \n> std::vector SimpleConverter::formats(PixelFormat input)\n> @@ -247,26 +247,14 @@ int SimpleConverter::queueBuffers(FrameBuffer *input, FrameBuffer *output)\n> \treturn 0;\n> }\n> \n> -void SimpleConverter::captureBufferReady(FrameBuffer *buffer)\n> +void SimpleConverter::m2mInputBufferReady(FrameBuffer *buffer)\n> {\n> -\tif (!outputDoneQueue_.empty()) {\n> -\t\tFrameBuffer *other = outputDoneQueue_.front();\n> -\t\toutputDoneQueue_.pop();\n> -\t\tbufferReady.emit(other, buffer);\n> -\t} else {\n> -\t\tcaptureDoneQueue_.push(buffer);\n> -\t}\n> +\tinputBufferReady.emit(buffer);\n> }\n> \n> -void SimpleConverter::outputBufferReady(FrameBuffer *buffer)\n> +void SimpleConverter::m2mOutputBufferReady(FrameBuffer *buffer)\n> {\n> -\tif (!captureDoneQueue_.empty()) {\n> -\t\tFrameBuffer *other = captureDoneQueue_.front();\n> -\t\tcaptureDoneQueue_.pop();\n> -\t\tbufferReady.emit(buffer, other);\n> -\t} else {\n> -\t\toutputDoneQueue_.push(buffer);\n> -\t}\n> +\toutputBufferReady.emit(buffer);\n> }\n> \n> } /* namespace libcamera */\n> diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\n> index 780bfa8f7832..739b24df0200 100644\n> --- a/src/libcamera/pipeline/simple/converter.h\n> +++ b/src/libcamera/pipeline/simple/converter.h\n> @@ -9,7 +9,6 @@\n> #define __LIBCAMERA_PIPELINE_SIMPLE_CONVERTER_H__\n> \n> #include \n> -#include \n> #include \n> #include \n> \n> @@ -47,17 +46,15 @@ public:\n> \n> \tint queueBuffers(FrameBuffer *input, FrameBuffer *output);\n> \n> -\tSignal bufferReady;\n> +\tSignal inputBufferReady;\n> +\tSignal outputBufferReady;\n> \n> private:\n> -\tvoid captureBufferReady(FrameBuffer *buffer);\n> -\tvoid outputBufferReady(FrameBuffer *buffer);\n> +\tvoid m2mInputBufferReady(FrameBuffer *buffer);\n> +\tvoid m2mOutputBufferReady(FrameBuffer *buffer);\n> \n> \tstd::unique_ptr m2m_;\n> \n> -\tstd::queue captureDoneQueue_;\n> -\tstd::queue outputDoneQueue_;\n> -\n> \tunsigned int inputBufferCount_;\n> \tunsigned int outputBufferCount_;\n> };\n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index 20a4ebca94fd..7f9c57234256 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -144,7 +144,8 @@ private:\n> \t}\n> \n> \tvoid bufferReady(FrameBuffer *buffer);\n> -\tvoid converterDone(FrameBuffer *input, FrameBuffer *output);\n> +\tvoid converterInputDone(FrameBuffer *buffer);\n> +\tvoid converterOutputDone(FrameBuffer *buffer);\n> \n> \tMediaDevice *media_;\n> \tstd::map> videos_;\n> @@ -768,7 +769,8 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> \t\t\t\t<< \"Failed to create converter, disabling format conversion\";\n> \t\t\tconverter_.reset();\n> \t\t} else {\n> -\t\t\tconverter_->bufferReady.connect(this, &SimplePipelineHandler::converterDone);\n> +\t\t\tconverter_->inputBufferReady.connect(this, &SimplePipelineHandler::converterInputDone);\n> +\t\t\tconverter_->outputBufferReady.connect(this, &SimplePipelineHandler::converterOutputDone);\n> \t\t}\n> \t}\n> \n> @@ -925,19 +927,23 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer)\n> \tcompleteRequest(request);\n> }\n> \n> -void SimplePipelineHandler::converterDone(FrameBuffer *input,\n> -\t\t\t\t\t FrameBuffer *output)\n> +void SimplePipelineHandler::converterInputDone(FrameBuffer *buffer)\n> {\n> \tASSERT(activeCamera_);\n> \tSimpleCameraData *data = cameraData(activeCamera_);\n> \n> -\t/* Complete the request. */\n> -\tRequest *request = output->request();\n> -\tcompleteBuffer(request, output);\n> -\tcompleteRequest(request);\n> -\n> \t/* Queue the input buffer back for capture. */\n> -\tdata->video_->queueBuffer(input);\n> +\tdata->video_->queueBuffer(buffer);\n> +}\n> +\n> +void SimplePipelineHandler::converterOutputDone(FrameBuffer *buffer)\n> +{\n> +\tASSERT(activeCamera_);\n> +\n> +\t/* Complete the request. */\n> +\tRequest *request = buffer->request();\n> +\tcompleteBuffer(request, buffer);\n> +\tcompleteRequest(request);\n> }\n\nI assume we still expect to maintain a one-in-one-out principle on the\nconvertor though (no interlacing/de-interacing type buffers though here).\n\nReviewed-by: Kieran Bingham \n\n> \n> REGISTER_PIPELINE_HANDLER(SimplePipelineHandler)\n>","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 5C3E0BD1F6\n\tfor ;\n\tFri, 19 Feb 2021 17:33:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D8937689E0;\n\tFri, 19 Feb 2021 18:33:27 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BAFBD689DB\n\tfor ;\n\tFri, 19 Feb 2021 18:33:26 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3267B596;\n\tFri, 19 Feb 2021 18:33:26 +0100 (CET)"],"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=\"nQ3Qd+Fg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613756006;\n\tbh=X0m8QerGdk0pR1y5YlAL6phmkud0YLAxLzZoEdECPZ8=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=nQ3Qd+Fg2oMlnngGYhNIFth7eDqVEEzdd2GUVY9hhHLSt6phR15SZK1OYxgkVT9up\n\tY3aDIJloCCEeS8k0p0d6kS8pYuQVSxMVmWz+B3N12R+NcFw0OXt+RRXkpkS39KePC6\n\tdzblexAhv5bvbjQK2hbRiYPD0adU1j+ZgyFeL2tM=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-9-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Fri, 19 Feb 2021 17:33:23 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20210131224702.8838-9-laurent.pinchart@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 08/20] libcamera: pipeline: simple:\n\tconverter: Decouple input and output completion","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","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"Phi-Bang Nguyen ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":15256,"web_url":"https://patchwork.libcamera.org/comment/15256/","msgid":"","date":"2021-02-21T13:06:39","subject":"Re: [libcamera-devel] [PATCH 08/20] libcamera: pipeline: simple:\n\tconverter: Decouple input and output completion","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Fri, Feb 19, 2021 at 05:33:23PM +0000, Kieran Bingham wrote:\n> On 31/01/2021 22:46, Laurent Pinchart wrote:\n> > The SimpleConverter API signals completion of input and output buffer\n> > pairs. This unnecessarily delays requeueing the input buffer to the\n> > video capture queue until the output buffer completes, and also delays\n> > signalling request completion until the input buffer completes. While\n> > this shouldn't cause large delays in practice, it will also not scale\n> > when multi-stream support will be added to the converter class.\n> > \n> > To address the current issue and prepare for the future, decouple\n> > signalling of input and output buffers completion.\n> > \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > src/libcamera/pipeline/simple/converter.cpp | 24 +++++--------------\n> > src/libcamera/pipeline/simple/converter.h | 11 ++++-----\n> > src/libcamera/pipeline/simple/simple.cpp | 26 +++++++++++++--------\n> > 3 files changed, 26 insertions(+), 35 deletions(-)\n> > \n> > diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> > index f782fbc63b09..8324baedc198 100644\n> > --- a/src/libcamera/pipeline/simple/converter.cpp\n> > +++ b/src/libcamera/pipeline/simple/converter.cpp\n> > @@ -45,8 +45,8 @@ SimpleConverter::SimpleConverter(MediaDevice *media)\n> > \t\treturn;\n> > \t}\n> > \n> > -\tm2m_->output()->bufferReady.connect(this, &SimpleConverter::outputBufferReady);\n> > -\tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::captureBufferReady);\n> > +\tm2m_->output()->bufferReady.connect(this, &SimpleConverter::m2mInputBufferReady);\n> > +\tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::m2mOutputBufferReady);\n> > }\n> > \n> > std::vector SimpleConverter::formats(PixelFormat input)\n> > @@ -247,26 +247,14 @@ int SimpleConverter::queueBuffers(FrameBuffer *input, FrameBuffer *output)\n> > \treturn 0;\n> > }\n> > \n> > -void SimpleConverter::captureBufferReady(FrameBuffer *buffer)\n> > +void SimpleConverter::m2mInputBufferReady(FrameBuffer *buffer)\n> > {\n> > -\tif (!outputDoneQueue_.empty()) {\n> > -\t\tFrameBuffer *other = outputDoneQueue_.front();\n> > -\t\toutputDoneQueue_.pop();\n> > -\t\tbufferReady.emit(other, buffer);\n> > -\t} else {\n> > -\t\tcaptureDoneQueue_.push(buffer);\n> > -\t}\n> > +\tinputBufferReady.emit(buffer);\n> > }\n> > \n> > -void SimpleConverter::outputBufferReady(FrameBuffer *buffer)\n> > +void SimpleConverter::m2mOutputBufferReady(FrameBuffer *buffer)\n> > {\n> > -\tif (!captureDoneQueue_.empty()) {\n> > -\t\tFrameBuffer *other = captureDoneQueue_.front();\n> > -\t\tcaptureDoneQueue_.pop();\n> > -\t\tbufferReady.emit(buffer, other);\n> > -\t} else {\n> > -\t\toutputDoneQueue_.push(buffer);\n> > -\t}\n> > +\toutputBufferReady.emit(buffer);\n> > }\n> > \n> > } /* namespace libcamera */\n> > diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\n> > index 780bfa8f7832..739b24df0200 100644\n> > --- a/src/libcamera/pipeline/simple/converter.h\n> > +++ b/src/libcamera/pipeline/simple/converter.h\n> > @@ -9,7 +9,6 @@\n> > #define __LIBCAMERA_PIPELINE_SIMPLE_CONVERTER_H__\n> > \n> > #include \n> > -#include \n> > #include \n> > #include \n> > \n> > @@ -47,17 +46,15 @@ public:\n> > \n> > \tint queueBuffers(FrameBuffer *input, FrameBuffer *output);\n> > \n> > -\tSignal bufferReady;\n> > +\tSignal inputBufferReady;\n> > +\tSignal outputBufferReady;\n> > \n> > private:\n> > -\tvoid captureBufferReady(FrameBuffer *buffer);\n> > -\tvoid outputBufferReady(FrameBuffer *buffer);\n> > +\tvoid m2mInputBufferReady(FrameBuffer *buffer);\n> > +\tvoid m2mOutputBufferReady(FrameBuffer *buffer);\n> > \n> > \tstd::unique_ptr m2m_;\n> > \n> > -\tstd::queue captureDoneQueue_;\n> > -\tstd::queue outputDoneQueue_;\n> > -\n> > \tunsigned int inputBufferCount_;\n> > \tunsigned int outputBufferCount_;\n> > };\n> > diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> > index 20a4ebca94fd..7f9c57234256 100644\n> > --- a/src/libcamera/pipeline/simple/simple.cpp\n> > +++ b/src/libcamera/pipeline/simple/simple.cpp\n> > @@ -144,7 +144,8 @@ private:\n> > \t}\n> > \n> > \tvoid bufferReady(FrameBuffer *buffer);\n> > -\tvoid converterDone(FrameBuffer *input, FrameBuffer *output);\n> > +\tvoid converterInputDone(FrameBuffer *buffer);\n> > +\tvoid converterOutputDone(FrameBuffer *buffer);\n> > \n> > \tMediaDevice *media_;\n> > \tstd::map> videos_;\n> > @@ -768,7 +769,8 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> > \t\t\t\t<< \"Failed to create converter, disabling format conversion\";\n> > \t\t\tconverter_.reset();\n> > \t\t} else {\n> > -\t\t\tconverter_->bufferReady.connect(this, &SimplePipelineHandler::converterDone);\n> > +\t\t\tconverter_->inputBufferReady.connect(this, &SimplePipelineHandler::converterInputDone);\n> > +\t\t\tconverter_->outputBufferReady.connect(this, &SimplePipelineHandler::converterOutputDone);\n> > \t\t}\n> > \t}\n> > \n> > @@ -925,19 +927,23 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer)\n> > \tcompleteRequest(request);\n> > }\n> > \n> > -void SimplePipelineHandler::converterDone(FrameBuffer *input,\n> > -\t\t\t\t\t FrameBuffer *output)\n> > +void SimplePipelineHandler::converterInputDone(FrameBuffer *buffer)\n> > {\n> > \tASSERT(activeCamera_);\n> > \tSimpleCameraData *data = cameraData(activeCamera_);\n> > \n> > -\t/* Complete the request. */\n> > -\tRequest *request = output->request();\n> > -\tcompleteBuffer(request, output);\n> > -\tcompleteRequest(request);\n> > -\n> > \t/* Queue the input buffer back for capture. */\n> > -\tdata->video_->queueBuffer(input);\n> > +\tdata->video_->queueBuffer(buffer);\n> > +}\n> > +\n> > +void SimplePipelineHandler::converterOutputDone(FrameBuffer *buffer)\n> > +{\n> > +\tASSERT(activeCamera_);\n> > +\n> > +\t/* Complete the request. */\n> > +\tRequest *request = buffer->request();\n> > +\tcompleteBuffer(request, buffer);\n> > +\tcompleteRequest(request);\n> > }\n> \n> I assume we still expect to maintain a one-in-one-out principle on the\n> convertor though (no interlacing/de-interacing type buffers though here).\n\nCorrect. Until someone needs this feature of couse :-)\n\n> Reviewed-by: Kieran Bingham \n> \n> > \n> > REGISTER_PIPELINE_HANDLER(SimplePipelineHandler)\n> >","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 7C71EBD1F6\n\tfor ;\n\tSun, 21 Feb 2021 13:07:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4CA3D689E3;\n\tSun, 21 Feb 2021 14:07:07 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 95593689C2\n\tfor ;\n\tSun, 21 Feb 2021 14:07:05 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 19396344;\n\tSun, 21 Feb 2021 14:07:05 +0100 (CET)"],"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=\"RbUvE4MI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613912825;\n\tbh=jnKU8Y4Q2+AVxHsPOt3pLIhmosvkA89mKS7iMFH5ZhE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=RbUvE4MIburiQrNTBgfUM+1S1IGSClb5c92NHTS1OtHLjmbBKzvlGXCGWFWJC9gYx\n\tKBAbay2rMEs6IBS7YAtq9J07aHynKg+0jpkRdfkHP5g/a7JsbPVZ/sdrSPyv/OHeNG\n\tVpt/jY28DgpivtPw6E6ccFaYXlRCfXctCFNhwrLk=","Date":"Sun, 21 Feb 2021 15:06:39 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-9-laurent.pinchart@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH 08/20] libcamera: pipeline: simple:\n\tconverter: Decouple input and output completion","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","Cc":"Phi-Bang Nguyen ,\n\tlibcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":15280,"web_url":"https://patchwork.libcamera.org/comment/15280/","msgid":"<20210222101853.GC50254@pyrite.rasen.tech>","date":"2021-02-22T10:18:53","subject":"Re: [libcamera-devel] [PATCH 08/20] libcamera: pipeline: simple:\n\tconverter: Decouple input and output completion","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Mon, Feb 01, 2021 at 12:46:50AM +0200, Laurent Pinchart wrote:\n> The SimpleConverter API signals completion of input and output buffer\n> pairs. This unnecessarily delays requeueing the input buffer to the\n> video capture queue until the output buffer completes, and also delays\n> signalling request completion until the input buffer completes. While\n> this shouldn't cause large delays in practice, it will also not scale\n> when multi-stream support will be added to the converter class.\n> \n> To address the current issue and prepare for the future, decouple\n> signalling of input and output buffers completion.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Paul Elder \n\n> ---\n> src/libcamera/pipeline/simple/converter.cpp | 24 +++++--------------\n> src/libcamera/pipeline/simple/converter.h | 11 ++++-----\n> src/libcamera/pipeline/simple/simple.cpp | 26 +++++++++++++--------\n> 3 files changed, 26 insertions(+), 35 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp\n> index f782fbc63b09..8324baedc198 100644\n> --- a/src/libcamera/pipeline/simple/converter.cpp\n> +++ b/src/libcamera/pipeline/simple/converter.cpp\n> @@ -45,8 +45,8 @@ SimpleConverter::SimpleConverter(MediaDevice *media)\n> \t\treturn;\n> \t}\n> \n> -\tm2m_->output()->bufferReady.connect(this, &SimpleConverter::outputBufferReady);\n> -\tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::captureBufferReady);\n> +\tm2m_->output()->bufferReady.connect(this, &SimpleConverter::m2mInputBufferReady);\n> +\tm2m_->capture()->bufferReady.connect(this, &SimpleConverter::m2mOutputBufferReady);\n> }\n> \n> std::vector SimpleConverter::formats(PixelFormat input)\n> @@ -247,26 +247,14 @@ int SimpleConverter::queueBuffers(FrameBuffer *input, FrameBuffer *output)\n> \treturn 0;\n> }\n> \n> -void SimpleConverter::captureBufferReady(FrameBuffer *buffer)\n> +void SimpleConverter::m2mInputBufferReady(FrameBuffer *buffer)\n> {\n> -\tif (!outputDoneQueue_.empty()) {\n> -\t\tFrameBuffer *other = outputDoneQueue_.front();\n> -\t\toutputDoneQueue_.pop();\n> -\t\tbufferReady.emit(other, buffer);\n> -\t} else {\n> -\t\tcaptureDoneQueue_.push(buffer);\n> -\t}\n> +\tinputBufferReady.emit(buffer);\n> }\n> \n> -void SimpleConverter::outputBufferReady(FrameBuffer *buffer)\n> +void SimpleConverter::m2mOutputBufferReady(FrameBuffer *buffer)\n> {\n> -\tif (!captureDoneQueue_.empty()) {\n> -\t\tFrameBuffer *other = captureDoneQueue_.front();\n> -\t\tcaptureDoneQueue_.pop();\n> -\t\tbufferReady.emit(buffer, other);\n> -\t} else {\n> -\t\toutputDoneQueue_.push(buffer);\n> -\t}\n> +\toutputBufferReady.emit(buffer);\n> }\n> \n> } /* namespace libcamera */\n> diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h\n> index 780bfa8f7832..739b24df0200 100644\n> --- a/src/libcamera/pipeline/simple/converter.h\n> +++ b/src/libcamera/pipeline/simple/converter.h\n> @@ -9,7 +9,6 @@\n> #define __LIBCAMERA_PIPELINE_SIMPLE_CONVERTER_H__\n> \n> #include \n> -#include \n> #include \n> #include \n> \n> @@ -47,17 +46,15 @@ public:\n> \n> \tint queueBuffers(FrameBuffer *input, FrameBuffer *output);\n> \n> -\tSignal bufferReady;\n> +\tSignal inputBufferReady;\n> +\tSignal outputBufferReady;\n> \n> private:\n> -\tvoid captureBufferReady(FrameBuffer *buffer);\n> -\tvoid outputBufferReady(FrameBuffer *buffer);\n> +\tvoid m2mInputBufferReady(FrameBuffer *buffer);\n> +\tvoid m2mOutputBufferReady(FrameBuffer *buffer);\n> \n> \tstd::unique_ptr m2m_;\n> \n> -\tstd::queue captureDoneQueue_;\n> -\tstd::queue outputDoneQueue_;\n> -\n> \tunsigned int inputBufferCount_;\n> \tunsigned int outputBufferCount_;\n> };\n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index 20a4ebca94fd..7f9c57234256 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -144,7 +144,8 @@ private:\n> \t}\n> \n> \tvoid bufferReady(FrameBuffer *buffer);\n> -\tvoid converterDone(FrameBuffer *input, FrameBuffer *output);\n> +\tvoid converterInputDone(FrameBuffer *buffer);\n> +\tvoid converterOutputDone(FrameBuffer *buffer);\n> \n> \tMediaDevice *media_;\n> \tstd::map> videos_;\n> @@ -768,7 +769,8 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> \t\t\t\t<< \"Failed to create converter, disabling format conversion\";\n> \t\t\tconverter_.reset();\n> \t\t} else {\n> -\t\t\tconverter_->bufferReady.connect(this, &SimplePipelineHandler::converterDone);\n> +\t\t\tconverter_->inputBufferReady.connect(this, &SimplePipelineHandler::converterInputDone);\n> +\t\t\tconverter_->outputBufferReady.connect(this, &SimplePipelineHandler::converterOutputDone);\n> \t\t}\n> \t}\n> \n> @@ -925,19 +927,23 @@ void SimplePipelineHandler::bufferReady(FrameBuffer *buffer)\n> \tcompleteRequest(request);\n> }\n> \n> -void SimplePipelineHandler::converterDone(FrameBuffer *input,\n> -\t\t\t\t\t FrameBuffer *output)\n> +void SimplePipelineHandler::converterInputDone(FrameBuffer *buffer)\n> {\n> \tASSERT(activeCamera_);\n> \tSimpleCameraData *data = cameraData(activeCamera_);\n> \n> -\t/* Complete the request. */\n> -\tRequest *request = output->request();\n> -\tcompleteBuffer(request, output);\n> -\tcompleteRequest(request);\n> -\n> \t/* Queue the input buffer back for capture. */\n> -\tdata->video_->queueBuffer(input);\n> +\tdata->video_->queueBuffer(buffer);\n> +}\n> +\n> +void SimplePipelineHandler::converterOutputDone(FrameBuffer *buffer)\n> +{\n> +\tASSERT(activeCamera_);\n> +\n> +\t/* Complete the request. */\n> +\tRequest *request = buffer->request();\n> +\tcompleteBuffer(request, buffer);\n> +\tcompleteRequest(request);\n> }\n> \n> REGISTER_PIPELINE_HANDLER(SimplePipelineHandler)\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 6ECA3BD1F6\n\tfor ;\n\tMon, 22 Feb 2021 10:19:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E3E0468A03;\n\tMon, 22 Feb 2021 11:19:02 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8C13B602F3\n\tfor ;\n\tMon, 22 Feb 2021 11:19:01 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 97309344;\n\tMon, 22 Feb 2021 11:18:59 +0100 (CET)"],"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=\"nSHbQvQa\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613989141;\n\tbh=7udYYEm4rSFKNHBEmrQXackY1Cgk7SYlImy33P4a9es=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=nSHbQvQaF0fEkkrmqOib3o9wjODtmVxI6ny6hFIcYf24SSNmWSQuObCnnI7IfBnhf\n\tz85JwZBeI+BVKhAQwG1i7A7CBsibzazCbYmqzCrokiN2OdywYSS6gtX7rylQ1MI75T\n\tB0xGb8ChRjBmSLg8bpDOb0uIlq+bMFweW8Rr0aKw=","Date":"Mon, 22 Feb 2021 19:18:53 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart ","Message-ID":"<20210222101853.GC50254@pyrite.rasen.tech>","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-9-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210131224702.8838-9-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 08/20] libcamera: pipeline: simple:\n\tconverter: Decouple input and output completion","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","Cc":"Phi-Bang Nguyen ,\n\tlibcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]