[{"id":12569,"web_url":"https://patchwork.libcamera.org/comment/12569/","msgid":"","date":"2020-09-18T12:55:23","subject":"Re: [libcamera-devel] [PATCH v8 12/12] pipeline: ipa: raspberrypi:\n\tHandle any externally allocated FrameBuffer","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Naush,\n\nOn 18/09/2020 10:42, Naushir Patuck wrote:\n> Handle the case where a FrameBuffer that has been externally allocated\n> (i.e. not through the v4l2 video device) is passed into a Request.\n> \n> We must store the buffer pointer in the stream internal buffer list to\n> identify when used.\n> \n> Signed-off-by: Naushir Patuck \n\nGreat, now there's no overflow issues ;-)\n\nReviewed-by: Kieran Bingham \n\n> ---\n> include/libcamera/ipa/raspberrypi.h | 11 ++--\n> src/ipa/raspberrypi/raspberrypi.cpp | 6 +-\n> .../pipeline/raspberrypi/raspberrypi.cpp | 64 +++++++++++++------\n> .../pipeline/raspberrypi/rpi_stream.cpp | 14 ++++\n> .../pipeline/raspberrypi/rpi_stream.h | 7 +-\n> 5 files changed, 73 insertions(+), 29 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h\n> index 262fc6f3..dd6ebeac 100644\n> --- a/include/libcamera/ipa/raspberrypi.h\n> +++ b/include/libcamera/ipa/raspberrypi.h\n> @@ -28,11 +28,12 @@ enum RPiOperations {\n> \tRPI_IPA_EVENT_QUEUE_REQUEST,\n> };\n> \n> -enum RPiIpaMask {\n> -\tID\t\t= 0x0ffff,\n> -\tSTATS\t\t= 0x10000,\n> -\tEMBEDDED_DATA\t= 0x20000,\n> -\tBAYER_DATA\t= 0x40000\n> +enum RPiBufferMask {\n> +\tID\t\t= 0x00ffff,\n> +\tSTATS\t\t= 0x010000,\n> +\tEMBEDDED_DATA\t= 0x020000,\n> +\tBAYER_DATA\t= 0x040000,\n> +\tEXTERNAL_BUFFER\t= 0x100000,\n> };\n> \n> /* Size of the LS grid allocation. */\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 688d2efc..0555cc4e 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -352,7 +352,7 @@ void IPARPi::processEvent(const IPAOperationData &event)\n> \n> \t\tIPAOperationData op;\n> \t\top.operation = RPI_IPA_ACTION_STATS_METADATA_COMPLETE;\n> -\t\top.data = { bufferId & RPiIpaMask::ID };\n> +\t\top.data = { bufferId & RPiBufferMask::ID };\n> \t\top.controls = { libcameraMetadata_ };\n> \t\tqueueFrameAction.emit(0, op);\n> \t\tbreak;\n> @@ -373,7 +373,7 @@ void IPARPi::processEvent(const IPAOperationData &event)\n> \t\t/* Ready to push the input buffer into the ISP. */\n> \t\tIPAOperationData op;\n> \t\top.operation = RPI_IPA_ACTION_RUN_ISP;\n> -\t\top.data = { bayerbufferId & RPiIpaMask::ID };\n> +\t\top.data = { bayerbufferId & RPiBufferMask::ID };\n> \t\tqueueFrameAction.emit(0, op);\n> \t\tbreak;\n> \t}\n> @@ -700,7 +700,7 @@ void IPARPi::returnEmbeddedBuffer(unsigned int bufferId)\n> {\n> \tIPAOperationData op;\n> \top.operation = RPI_IPA_ACTION_EMBEDDED_COMPLETE;\n> -\top.data = { bufferId & RPiIpaMask::ID };\n> +\top.data = { bufferId & RPiBufferMask::ID };\n> \tqueueFrameAction.emit(0, op);\n> }\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 4e12c7d6..50f07182 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -151,6 +151,7 @@ public:\n> \n> \tvoid clearIncompleteRequests();\n> \tvoid handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n> +\tvoid handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n> \tvoid handleState();\n> \n> \tCameraSensor *sensor_;\n> @@ -725,23 +726,32 @@ int PipelineHandlerRPi::queueRequestDevice(Camera *camera, Request *request)\n> \n> \t/* Push all buffers supplied in the Request to the respective streams. */\n> \tfor (auto stream : data->streams_) {\n> -\t\tif (stream->isExternal()) {\n> -\t\t\tFrameBuffer *buffer = request->findBuffer(stream);\n> +\t\tif (!stream->isExternal())\n> +\t\t\tcontinue;\n> +\n> +\t\tFrameBuffer *buffer = request->findBuffer(stream);\n> +\t\tif (buffer && stream->getBufferId(buffer) == -1) {\n> \t\t\t/*\n> -\t\t\t * If no buffer is provided by the request for this stream, we\n> -\t\t\t * queue a nullptr to the stream to signify that it must use an\n> -\t\t\t * internally allocated buffer for this capture request. This\n> -\t\t\t * buffer will not be given back to the application, but is used\n> -\t\t\t * to support the internal pipeline flow.\n> -\t\t\t *\n> -\t\t\t * The below queueBuffer() call will do nothing if there are not\n> -\t\t\t * enough internal buffers allocated, but this will be handled by\n> -\t\t\t * queuing the request for buffers in the RPiStream object.\n> +\t\t\t * This buffer is not recognised, so it must have been allocated\n> +\t\t\t * outside the v4l2 device. Store it in the stream buffer list\n> +\t\t\t * so we can track it.\n> \t\t\t */\n> -\t\t\tint ret = stream->queueBuffer(buffer);\n> -\t\t\tif (ret)\n> -\t\t\t\treturn ret;\n> +\t\t\tstream->setExternalBuffer(buffer);\n> \t\t}\n> +\t\t/*\n> +\t\t * If no buffer is provided by the request for this stream, we\n> +\t\t * queue a nullptr to the stream to signify that it must use an\n> +\t\t * internally allocated buffer for this capture request. This\n> +\t\t * buffer will not be given back to the application, but is used\n> +\t\t * to support the internal pipeline flow.\n> +\t\t *\n> +\t\t * The below queueBuffer() call will do nothing if there are not\n> +\t\t * enough internal buffers allocated, but this will be handled by\n> +\t\t * queuing the request for buffers in the RPiStream object.\n> +\t\t */\n> +\t\tint ret = stream->queueBuffer(buffer);\n> +\t\tif (ret)\n> +\t\t\treturn ret;\n> \t}\n> \n> \t/* Push the request to the back of the queue. */\n> @@ -915,8 +925,8 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n> \t * Pass the stats and embedded data buffers to the IPA. No other\n> \t * buffers need to be passed.\n> \t */\n> -\tmapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), RPiIpaMask::STATS);\n> -\tmapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(), RPiIpaMask::EMBEDDED_DATA);\n> +\tmapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), RPiBufferMask::STATS);\n> +\tmapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(), RPiBufferMask::EMBEDDED_DATA);\n> \n> \treturn 0;\n> }\n> @@ -1219,7 +1229,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n> \tif (stream == &isp_[Isp::Stats]) {\n> \t\tIPAOperationData op;\n> \t\top.operation = RPI_IPA_EVENT_SIGNAL_STAT_READY;\n> -\t\top.data = { RPiIpaMask::STATS | static_cast(index) };\n> +\t\top.data = { RPiBufferMask::STATS | static_cast(index) };\n> \t\tipa_->processEvent(op);\n> \t} else {\n> \t\t/* Any other ISP output can be handed back to the application now. */\n> @@ -1297,6 +1307,11 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stre\n> \t\t */\n> \t\tRequest *request = requestQueue_.empty() ? nullptr : requestQueue_.front();\n> \t\tif (!dropFrameCount_ && request && request->findBuffer(stream) == buffer) {\n> +\t\t\t/*\n> +\t\t\t * Check if this is an externally provided buffer, and if\n> +\t\t\t * so, we must stop tracking it in the pipeline handler.\n> +\t\t\t */\n> +\t\t\thandleExternalBuffer(buffer, stream);\n> \t\t\t/*\n> \t\t\t * Tag the buffer as completed, returning it to the\n> \t\t\t * application.\n> @@ -1315,6 +1330,17 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stre\n> \t}\n> }\n> \n> +void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream)\n> +{\n> +\tunsigned int id = stream->getBufferId(buffer);\n> +\n> +\tif (!(id & RPiBufferMask::EXTERNAL_BUFFER))\n> +\t\treturn;\n> +\n> +\t/* Stop the Stream object from tracking the buffer. */\n> +\tstream->removeExternalBuffer(buffer);\n> +}\n> +\n> void RPiCameraData::handleState()\n> {\n> \tswitch (state_) {\n> @@ -1447,8 +1473,8 @@ void RPiCameraData::tryRunPipeline()\n> \t\t\t<< \" Embedded buffer id: \" << embeddedId;\n> \n> \top.operation = RPI_IPA_EVENT_SIGNAL_ISP_PREPARE;\n> -\top.data = { RPiIpaMask::EMBEDDED_DATA | embeddedId,\n> -\t\t RPiIpaMask::BAYER_DATA | bayerId };\n> +\top.data = { RPiBufferMask::EMBEDDED_DATA | embeddedId,\n> +\t\t RPiBufferMask::BAYER_DATA | bayerId };\n> \tipa_->processEvent(op);\n> }\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> index aee0aa2d..2dcf96ca 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> @@ -68,6 +68,20 @@ int RPiStream::getBufferId(FrameBuffer *buffer) const\n> \treturn it->first;\n> }\n> \n> +void RPiStream::setExternalBuffer(FrameBuffer *buffer)\n> +{\n> +\tbufferMap_.emplace(RPiBufferMask::EXTERNAL_BUFFER | id_.get(), buffer);\n> +}\n> +\n> +void RPiStream::removeExternalBuffer(FrameBuffer *buffer)\n> +{\n> +\tint id = getBufferId(buffer);\n> +\n> +\t/* Ensure we have this buffer in the stream, and it is marked external. */\n> +\tASSERT(id != -1 && (id & RPiBufferMask::EXTERNAL_BUFFER));\n> +\tbufferMap_.erase(id);\n> +}\n> +\n> int RPiStream::prepareBuffers(unsigned int count)\n> {\n> \tint ret;\n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> index df986367..a2c21bcd 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> @@ -31,13 +31,13 @@ class RPiStream : public Stream\n> {\n> public:\n> \tRPiStream()\n> -\t\t: id_(RPiIpaMask::ID)\n> +\t\t: id_(RPiBufferMask::ID)\n> \t{\n> \t}\n> \n> \tRPiStream(const char *name, MediaEntity *dev, bool importOnly = false)\n> \t\t: external_(false), importOnly_(importOnly), name_(name),\n> -\t\t dev_(std::make_unique(dev)), id_(RPiIpaMask::ID)\n> +\t\t dev_(std::make_unique(dev)), id_(RPiBufferMask::ID)\n> \t{\n> \t}\n> \n> @@ -53,6 +53,9 @@ public:\n> \tconst BufferMap &getBuffers() const;\n> \tint getBufferId(FrameBuffer *buffer) const;\n> \n> +\tvoid setExternalBuffer(FrameBuffer *buffer);\n> +\tvoid removeExternalBuffer(FrameBuffer *buffer);\n> +\n> \tint prepareBuffers(unsigned int count);\n> \tint queueBuffer(FrameBuffer *buffer);\n> \tvoid returnBuffer(FrameBuffer *buffer);\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 7A555C3B5B\n\tfor ;\n\tFri, 18 Sep 2020 12:55:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 44B6162FB5;\n\tFri, 18 Sep 2020 14:55:27 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 01D5D60576\n\tfor ;\n\tFri, 18 Sep 2020 14:55:26 +0200 (CEST)","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 7E6132D7;\n\tFri, 18 Sep 2020 14:55:25 +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=\"XRSMgiZm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600433725;\n\tbh=/ov0O+Nun+2e9PGrQMci7QeLf77cMZeULTOpt0oLWuU=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=XRSMgiZmBQzhY6ktZqjCUcCyLjnzbMGw5EFgx8uYrwgLi/7gp6KVN1gnz0XZldM1X\n\tjZCPTNC4QWs6GMgn2hqHElNqPIScWb3fWH9XgHaHc7ygfm1L2WDDt//vNTLr9Dj+xq\n\tU2KKj8VtqOKfxvZd8OtjMWOtVCB0ciJFaEMsEA+M=","To":"Naushir Patuck ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200918094233.5273-1-naush@raspberrypi.com>\n\t<20200918094233.5273-13-naush@raspberrypi.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, 18 Sep 2020 13:55:23 +0100","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":"<20200918094233.5273-13-naush@raspberrypi.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v8 12/12] pipeline: ipa: raspberrypi:\n\tHandle any externally allocated FrameBuffer","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12593,"web_url":"https://patchwork.libcamera.org/comment/12593/","msgid":"<20200919130003.GZ1850958@oden.dyn.berto.se>","date":"2020-09-19T13:00:03","subject":"Re: [libcamera-devel] [PATCH v8 12/12] pipeline: ipa: raspberrypi:\n\tHandle any externally allocated FrameBuffer","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Naushir,\n\nThanks for your patch.\n\nOn 2020-09-18 10:42:33 +0100, Naushir Patuck wrote:\n> Handle the case where a FrameBuffer that has been externally allocated\n> (i.e. not through the v4l2 video device) is passed into a Request.\n> \n> We must store the buffer pointer in the stream internal buffer list to\n> identify when used.\n> \n> Signed-off-by: Naushir Patuck \n\nReviewed-by: Niklas Söderlund \n\nI intend to give this series a final test on Monday and then merge it, \nunless someone screams of course ;-P Thanks for your persistent work on \nthis series!\n\n> ---\n> include/libcamera/ipa/raspberrypi.h | 11 ++--\n> src/ipa/raspberrypi/raspberrypi.cpp | 6 +-\n> .../pipeline/raspberrypi/raspberrypi.cpp | 64 +++++++++++++------\n> .../pipeline/raspberrypi/rpi_stream.cpp | 14 ++++\n> .../pipeline/raspberrypi/rpi_stream.h | 7 +-\n> 5 files changed, 73 insertions(+), 29 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h\n> index 262fc6f3..dd6ebeac 100644\n> --- a/include/libcamera/ipa/raspberrypi.h\n> +++ b/include/libcamera/ipa/raspberrypi.h\n> @@ -28,11 +28,12 @@ enum RPiOperations {\n> \tRPI_IPA_EVENT_QUEUE_REQUEST,\n> };\n> \n> -enum RPiIpaMask {\n> -\tID\t\t= 0x0ffff,\n> -\tSTATS\t\t= 0x10000,\n> -\tEMBEDDED_DATA\t= 0x20000,\n> -\tBAYER_DATA\t= 0x40000\n> +enum RPiBufferMask {\n> +\tID\t\t= 0x00ffff,\n> +\tSTATS\t\t= 0x010000,\n> +\tEMBEDDED_DATA\t= 0x020000,\n> +\tBAYER_DATA\t= 0x040000,\n> +\tEXTERNAL_BUFFER\t= 0x100000,\n> };\n> \n> /* Size of the LS grid allocation. */\n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 688d2efc..0555cc4e 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -352,7 +352,7 @@ void IPARPi::processEvent(const IPAOperationData &event)\n> \n> \t\tIPAOperationData op;\n> \t\top.operation = RPI_IPA_ACTION_STATS_METADATA_COMPLETE;\n> -\t\top.data = { bufferId & RPiIpaMask::ID };\n> +\t\top.data = { bufferId & RPiBufferMask::ID };\n> \t\top.controls = { libcameraMetadata_ };\n> \t\tqueueFrameAction.emit(0, op);\n> \t\tbreak;\n> @@ -373,7 +373,7 @@ void IPARPi::processEvent(const IPAOperationData &event)\n> \t\t/* Ready to push the input buffer into the ISP. */\n> \t\tIPAOperationData op;\n> \t\top.operation = RPI_IPA_ACTION_RUN_ISP;\n> -\t\top.data = { bayerbufferId & RPiIpaMask::ID };\n> +\t\top.data = { bayerbufferId & RPiBufferMask::ID };\n> \t\tqueueFrameAction.emit(0, op);\n> \t\tbreak;\n> \t}\n> @@ -700,7 +700,7 @@ void IPARPi::returnEmbeddedBuffer(unsigned int bufferId)\n> {\n> \tIPAOperationData op;\n> \top.operation = RPI_IPA_ACTION_EMBEDDED_COMPLETE;\n> -\top.data = { bufferId & RPiIpaMask::ID };\n> +\top.data = { bufferId & RPiBufferMask::ID };\n> \tqueueFrameAction.emit(0, op);\n> }\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 4e12c7d6..50f07182 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -151,6 +151,7 @@ public:\n> \n> \tvoid clearIncompleteRequests();\n> \tvoid handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n> +\tvoid handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n> \tvoid handleState();\n> \n> \tCameraSensor *sensor_;\n> @@ -725,23 +726,32 @@ int PipelineHandlerRPi::queueRequestDevice(Camera *camera, Request *request)\n> \n> \t/* Push all buffers supplied in the Request to the respective streams. */\n> \tfor (auto stream : data->streams_) {\n> -\t\tif (stream->isExternal()) {\n> -\t\t\tFrameBuffer *buffer = request->findBuffer(stream);\n> +\t\tif (!stream->isExternal())\n> +\t\t\tcontinue;\n> +\n> +\t\tFrameBuffer *buffer = request->findBuffer(stream);\n> +\t\tif (buffer && stream->getBufferId(buffer) == -1) {\n> \t\t\t/*\n> -\t\t\t * If no buffer is provided by the request for this stream, we\n> -\t\t\t * queue a nullptr to the stream to signify that it must use an\n> -\t\t\t * internally allocated buffer for this capture request. This\n> -\t\t\t * buffer will not be given back to the application, but is used\n> -\t\t\t * to support the internal pipeline flow.\n> -\t\t\t *\n> -\t\t\t * The below queueBuffer() call will do nothing if there are not\n> -\t\t\t * enough internal buffers allocated, but this will be handled by\n> -\t\t\t * queuing the request for buffers in the RPiStream object.\n> +\t\t\t * This buffer is not recognised, so it must have been allocated\n> +\t\t\t * outside the v4l2 device. Store it in the stream buffer list\n> +\t\t\t * so we can track it.\n> \t\t\t */\n> -\t\t\tint ret = stream->queueBuffer(buffer);\n> -\t\t\tif (ret)\n> -\t\t\t\treturn ret;\n> +\t\t\tstream->setExternalBuffer(buffer);\n> \t\t}\n> +\t\t/*\n> +\t\t * If no buffer is provided by the request for this stream, we\n> +\t\t * queue a nullptr to the stream to signify that it must use an\n> +\t\t * internally allocated buffer for this capture request. This\n> +\t\t * buffer will not be given back to the application, but is used\n> +\t\t * to support the internal pipeline flow.\n> +\t\t *\n> +\t\t * The below queueBuffer() call will do nothing if there are not\n> +\t\t * enough internal buffers allocated, but this will be handled by\n> +\t\t * queuing the request for buffers in the RPiStream object.\n> +\t\t */\n> +\t\tint ret = stream->queueBuffer(buffer);\n> +\t\tif (ret)\n> +\t\t\treturn ret;\n> \t}\n> \n> \t/* Push the request to the back of the queue. */\n> @@ -915,8 +925,8 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n> \t * Pass the stats and embedded data buffers to the IPA. No other\n> \t * buffers need to be passed.\n> \t */\n> -\tmapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), RPiIpaMask::STATS);\n> -\tmapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(), RPiIpaMask::EMBEDDED_DATA);\n> +\tmapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), RPiBufferMask::STATS);\n> +\tmapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(), RPiBufferMask::EMBEDDED_DATA);\n> \n> \treturn 0;\n> }\n> @@ -1219,7 +1229,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n> \tif (stream == &isp_[Isp::Stats]) {\n> \t\tIPAOperationData op;\n> \t\top.operation = RPI_IPA_EVENT_SIGNAL_STAT_READY;\n> -\t\top.data = { RPiIpaMask::STATS | static_cast(index) };\n> +\t\top.data = { RPiBufferMask::STATS | static_cast(index) };\n> \t\tipa_->processEvent(op);\n> \t} else {\n> \t\t/* Any other ISP output can be handed back to the application now. */\n> @@ -1297,6 +1307,11 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stre\n> \t\t */\n> \t\tRequest *request = requestQueue_.empty() ? nullptr : requestQueue_.front();\n> \t\tif (!dropFrameCount_ && request && request->findBuffer(stream) == buffer) {\n> +\t\t\t/*\n> +\t\t\t * Check if this is an externally provided buffer, and if\n> +\t\t\t * so, we must stop tracking it in the pipeline handler.\n> +\t\t\t */\n> +\t\t\thandleExternalBuffer(buffer, stream);\n> \t\t\t/*\n> \t\t\t * Tag the buffer as completed, returning it to the\n> \t\t\t * application.\n> @@ -1315,6 +1330,17 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stre\n> \t}\n> }\n> \n> +void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream)\n> +{\n> +\tunsigned int id = stream->getBufferId(buffer);\n> +\n> +\tif (!(id & RPiBufferMask::EXTERNAL_BUFFER))\n> +\t\treturn;\n> +\n> +\t/* Stop the Stream object from tracking the buffer. */\n> +\tstream->removeExternalBuffer(buffer);\n> +}\n> +\n> void RPiCameraData::handleState()\n> {\n> \tswitch (state_) {\n> @@ -1447,8 +1473,8 @@ void RPiCameraData::tryRunPipeline()\n> \t\t\t<< \" Embedded buffer id: \" << embeddedId;\n> \n> \top.operation = RPI_IPA_EVENT_SIGNAL_ISP_PREPARE;\n> -\top.data = { RPiIpaMask::EMBEDDED_DATA | embeddedId,\n> -\t\t RPiIpaMask::BAYER_DATA | bayerId };\n> +\top.data = { RPiBufferMask::EMBEDDED_DATA | embeddedId,\n> +\t\t RPiBufferMask::BAYER_DATA | bayerId };\n> \tipa_->processEvent(op);\n> }\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> index aee0aa2d..2dcf96ca 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> @@ -68,6 +68,20 @@ int RPiStream::getBufferId(FrameBuffer *buffer) const\n> \treturn it->first;\n> }\n> \n> +void RPiStream::setExternalBuffer(FrameBuffer *buffer)\n> +{\n> +\tbufferMap_.emplace(RPiBufferMask::EXTERNAL_BUFFER | id_.get(), buffer);\n> +}\n> +\n> +void RPiStream::removeExternalBuffer(FrameBuffer *buffer)\n> +{\n> +\tint id = getBufferId(buffer);\n> +\n> +\t/* Ensure we have this buffer in the stream, and it is marked external. */\n> +\tASSERT(id != -1 && (id & RPiBufferMask::EXTERNAL_BUFFER));\n> +\tbufferMap_.erase(id);\n> +}\n> +\n> int RPiStream::prepareBuffers(unsigned int count)\n> {\n> \tint ret;\n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> index df986367..a2c21bcd 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> @@ -31,13 +31,13 @@ class RPiStream : public Stream\n> {\n> public:\n> \tRPiStream()\n> -\t\t: id_(RPiIpaMask::ID)\n> +\t\t: id_(RPiBufferMask::ID)\n> \t{\n> \t}\n> \n> \tRPiStream(const char *name, MediaEntity *dev, bool importOnly = false)\n> \t\t: external_(false), importOnly_(importOnly), name_(name),\n> -\t\t dev_(std::make_unique(dev)), id_(RPiIpaMask::ID)\n> +\t\t dev_(std::make_unique(dev)), id_(RPiBufferMask::ID)\n> \t{\n> \t}\n> \n> @@ -53,6 +53,9 @@ public:\n> \tconst BufferMap &getBuffers() const;\n> \tint getBufferId(FrameBuffer *buffer) const;\n> \n> +\tvoid setExternalBuffer(FrameBuffer *buffer);\n> +\tvoid removeExternalBuffer(FrameBuffer *buffer);\n> +\n> \tint prepareBuffers(unsigned int count);\n> \tint queueBuffer(FrameBuffer *buffer);\n> \tvoid returnBuffer(FrameBuffer *buffer);\n> -- \n> 2.25.1\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 BCBA7BF01C\n\tfor ;\n\tSat, 19 Sep 2020 13:00:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5557462FBC;\n\tSat, 19 Sep 2020 15:00:06 +0200 (CEST)","from mail-lf1-x136.google.com (mail-lf1-x136.google.com\n\t[IPv6:2a00:1450:4864:20::136])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0472D60367\n\tfor ;\n\tSat, 19 Sep 2020 15:00:05 +0200 (CEST)","by mail-lf1-x136.google.com with SMTP id z17so9041208lfi.12\n\tfor ;\n\tSat, 19 Sep 2020 06:00:04 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tc22sm1260621lff.202.2020.09.19.06.00.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 19 Sep 2020 06:00:03 -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=\"is3sHyZi\"; 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=Luqxj5lMPeGNHoHwIUCAF5CzzwrQJ+5TgFI9xNje2HI=;\n\tb=is3sHyZi+17T4ZNw6UsWOVQfpnS/eMiuNS3Rw9EbLJdT3VXDEZR55/9kVx82OxXVO+\n\tX6i2tVM1QOKPgz3LFK7+ZNdW/H+qtvRY/5JGG9SMpLZ5NPLvRh2oo0fIYFQHlekiCno3\n\t5mVaTQcd269oJmM2RuSxhRj3z1qF9S9WXRPVDcpYW/ME4OZh6w4vlz6d6uIACnioHus0\n\tVSTJDAzY1m++qR9w0I9dpWmLHVMCCFIAz+phYo/VTzOHnnLvGFgeprugWEIMDSG23ohp\n\tDkykzNsc760ITOOABPPP/tPza6r9ahGckTVejnjANk8nBL90fdyD7Zu2ybA9tVVTiRVY\n\tF78A==","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=Luqxj5lMPeGNHoHwIUCAF5CzzwrQJ+5TgFI9xNje2HI=;\n\tb=lVcuGZsLH8VIlKlWkDPW9SKNUXKU+WfHeYcER/Tk6phwCWuBSusJoJusYZhUxj6lXV\n\t4A1Hiw1zO7kf1MvP3JA5aQ/9xf3E5rWMrc8eowBXzIeYiOXlMfq7WdNjbkDL1IOq+RaX\n\tra02Mb0bYQYifF+nOENOyOyID63TC7x1TnC/zLsegFVZxs1BHsZult9k3XAz5S9Epucf\n\tSpT9aHvWNOXHsTelqr95TyR922TIS1El6QmhqXGQnyea+3IGk0WNqHNRtKyiqCulpUJs\n\tbNvMNUcb4n16Wjc4pnw+36N5NRSoynex84YD2SCWtzzo/ugulL4f+CklrGapvVGQCR/2\n\tysag==","X-Gm-Message-State":"AOAM530ejC7Ow4XjThS7a2rGmHA1x9cp2LzxXECat0q3dl/OVMs2AhPG\n\thPuA9NUkV/vBHeMonrO9iGu1Y/WUeuNk6g==","X-Google-Smtp-Source":"ABdhPJzthbxu4h3b3IRlekfZQJtvt32CKwPLRaab+TU0c9d3otOrsfAvT0CyvTStUnfz2nmExgx7pw==","X-Received":"by 2002:ac2:593b:: with SMTP id\n\tv27mr13619695lfi.338.1600520404251; \n\tSat, 19 Sep 2020 06:00:04 -0700 (PDT)","Date":"Sat, 19 Sep 2020 15:00:03 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Naushir Patuck ","Message-ID":"<20200919130003.GZ1850958@oden.dyn.berto.se>","References":"<20200918094233.5273-1-naush@raspberrypi.com>\n\t<20200918094233.5273-13-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200918094233.5273-13-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v8 12/12] pipeline: ipa: raspberrypi:\n\tHandle any externally allocated FrameBuffer","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":"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\" "}}]