[{"id":12647,"web_url":"https://patchwork.libcamera.org/comment/12647/","msgid":"<20200923074459.niostc43hb5e3khd@uno.localdomain>","date":"2020-09-23T07:44:59","subject":"Re: [libcamera-devel] [PATCH 1/4] pipeline: raspberrypi: Move\n\tRPiStream and RPiDevice to its own namespace","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Naush,\n\nnit on subject: both classes are already in their own RPi namespace\nYou are just renaming them\n\nOn Tue, Sep 22, 2020 at 10:50:15AM +0100, Naushir Patuck wrote:\n> Rename RpiStream -> RPi::Stream and RPiDevice -> RPi::Device.\n\nRename RPi::RPiStream -> RPi::Stream and RPi::RPiDevice -> RPi::Device\n>\n> There are no functional changes in this commit.\n>\n> Signed-off-by: Naushir Patuck \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> .../pipeline/raspberrypi/raspberrypi.cpp | 42 +++++++++----------\n> .../pipeline/raspberrypi/rpi_stream.cpp | 34 +++++++--------\n> .../pipeline/raspberrypi/rpi_stream.h | 16 +++----\n> 3 files changed, 46 insertions(+), 46 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 50f07182..5ed74d51 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -150,16 +150,16 @@ public:\n> \tvoid ispOutputDequeue(FrameBuffer *buffer);\n>\n> \tvoid clearIncompleteRequests();\n> -\tvoid handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n> -\tvoid handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n> +\tvoid handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream);\n> +\tvoid handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream);\n> \tvoid handleState();\n>\n> \tCameraSensor *sensor_;\n> \t/* Array of Unicam and ISP device streams and associated buffers/streams. */\n> -\tRPi::RPiDevice unicam_;\n> -\tRPi::RPiDevice isp_;\n> +\tRPi::Device unicam_;\n> +\tRPi::Device isp_;\n> \t/* The vector below is just for convenience when iterating over all streams. */\n> -\tstd::vector streams_;\n> +\tstd::vector streams_;\n> \t/* Stores the ids of the buffers mapped in the IPA. */\n> \tstd::unordered_set ipaBuffers_;\n>\n> @@ -189,7 +189,7 @@ private:\n> \tvoid tryRunPipeline();\n> \tvoid tryFlushQueues();\n> \tFrameBuffer *updateQueue(std::queue &q, uint64_t timestamp,\n> -\t\t\t\t RPi::RPiStream *stream);\n> +\t\t\t\t RPi::Stream *stream);\n>\n> \tunsigned int ispOutputCount_;\n> };\n> @@ -618,7 +618,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n> int PipelineHandlerRPi::exportFrameBuffers([[maybe_unused]] Camera *camera, Stream *stream,\n> \t\t\t\t\t std::vector> *buffers)\n> {\n> -\tRPi::RPiStream *s = static_cast(stream);\n> +\tRPi::Stream *s = static_cast(stream);\n> \tunsigned int count = stream->configuration().bufferCount;\n> \tint ret = s->dev()->exportBuffers(count, buffers);\n>\n> @@ -787,14 +787,14 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n> \t\treturn false;\n>\n> \t/* Locate and open the unicam video streams. */\n> -\tdata->unicam_[Unicam::Embedded] = RPi::RPiStream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n> -\tdata->unicam_[Unicam::Image] = RPi::RPiStream(\"Unicam Image\", unicam_->getEntityByName(\"unicam-image\"));\n> +\tdata->unicam_[Unicam::Embedded] = RPi::Stream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n> +\tdata->unicam_[Unicam::Image] = RPi::Stream(\"Unicam Image\", unicam_->getEntityByName(\"unicam-image\"));\n>\n> \t/* Tag the ISP input stream as an import stream. */\n> -\tdata->isp_[Isp::Input] = RPi::RPiStream(\"ISP Input\", isp_->getEntityByName(\"bcm2835-isp0-output0\"), true);\n> -\tdata->isp_[Isp::Output0] = RPi::RPiStream(\"ISP Output0\", isp_->getEntityByName(\"bcm2835-isp0-capture1\"));\n> -\tdata->isp_[Isp::Output1] = RPi::RPiStream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n> -\tdata->isp_[Isp::Stats] = RPi::RPiStream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n> +\tdata->isp_[Isp::Input] = RPi::Stream(\"ISP Input\", isp_->getEntityByName(\"bcm2835-isp0-output0\"), true);\n> +\tdata->isp_[Isp::Output0] = RPi::Stream(\"ISP Output0\", isp_->getEntityByName(\"bcm2835-isp0-capture1\"));\n> +\tdata->isp_[Isp::Output1] = RPi::Stream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n> +\tdata->isp_[Isp::Stats] = RPi::Stream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n>\n> \t/* This is just for convenience so that we can easily iterate over all streams. */\n> \tfor (auto &stream : data->unicam_)\n> @@ -912,7 +912,7 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n> \t */\n> \tunsigned int maxBuffers = 0;\n> \tfor (const Stream *s : camera->streams())\n> -\t\tif (static_cast(s)->isExternal())\n> +\t\tif (static_cast(s)->isExternal())\n> \t\t\tmaxBuffers = std::max(maxBuffers, s->configuration().bufferCount);\n>\n> \tfor (auto const stream : data->streams_) {\n> @@ -1133,13 +1133,13 @@ done:\n>\n> void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n> {\n> -\tRPi::RPiStream *stream = nullptr;\n> +\tRPi::Stream *stream = nullptr;\n> \tint index;\n>\n> \tif (state_ == State::Stopped)\n> \t\treturn;\n>\n> -\tfor (RPi::RPiStream &s : unicam_) {\n> +\tfor (RPi::Stream &s : unicam_) {\n> \t\tindex = s.getBufferId(buffer);\n> \t\tif (index != -1) {\n> \t\t\tstream = &s;\n> @@ -1201,13 +1201,13 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer)\n>\n> void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n> {\n> -\tRPi::RPiStream *stream = nullptr;\n> +\tRPi::Stream *stream = nullptr;\n> \tint index;\n>\n> \tif (state_ == State::Stopped)\n> \t\treturn;\n>\n> -\tfor (RPi::RPiStream &s : isp_) {\n> +\tfor (RPi::Stream &s : isp_) {\n> \t\tindex = s.getBufferId(buffer);\n> \t\tif (index != -1) {\n> \t\t\tstream = &s;\n> @@ -1297,7 +1297,7 @@ void RPiCameraData::clearIncompleteRequests()\n> \t}\n> }\n>\n> -void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream)\n> +void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n> {\n> \tif (stream->isExternal()) {\n> \t\t/*\n> @@ -1330,7 +1330,7 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stre\n> \t}\n> }\n>\n> -void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream)\n> +void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n> {\n> \tunsigned int id = stream->getBufferId(buffer);\n>\n> @@ -1510,7 +1510,7 @@ void RPiCameraData::tryFlushQueues()\n> }\n>\n> FrameBuffer *RPiCameraData::updateQueue(std::queue &q, uint64_t timestamp,\n> -\t\t\t\t\tRPi::RPiStream *stream)\n> +\t\t\t\t\tRPi::Stream *stream)\n> {\n> \t/*\n> \t * If the unicam streams are external (both have be to the same), then we\n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> index 2dcf96ca..3ee859e9 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> @@ -14,46 +14,46 @@ LOG_DEFINE_CATEGORY(RPISTREAM)\n>\n> namespace RPi {\n>\n> -V4L2VideoDevice *RPiStream::dev() const\n> +V4L2VideoDevice *Stream::dev() const\n> {\n> \treturn dev_.get();\n> }\n>\n> -std::string RPiStream::name() const\n> +std::string Stream::name() const\n> {\n> \treturn name_;\n> }\n>\n> -void RPiStream::reset()\n> +void Stream::reset()\n> {\n> \texternal_ = false;\n> \tclearBuffers();\n> }\n>\n> -void RPiStream::setExternal(bool external)\n> +void Stream::setExternal(bool external)\n> {\n> \t/* Import streams cannot be external. */\n> \tASSERT(!external || !importOnly_);\n> \texternal_ = external;\n> }\n>\n> -bool RPiStream::isExternal() const\n> +bool Stream::isExternal() const\n> {\n> \treturn external_;\n> }\n>\n> -void RPiStream::setExportedBuffers(std::vector> *buffers)\n> +void Stream::setExportedBuffers(std::vector> *buffers)\n> {\n> \tfor (auto const &buffer : *buffers)\n> \t\tbufferMap_.emplace(id_.get(), buffer.get());\n> }\n>\n> -const BufferMap &RPiStream::getBuffers() const\n> +const BufferMap &Stream::getBuffers() const\n> {\n> \treturn bufferMap_;\n> }\n>\n> -int RPiStream::getBufferId(FrameBuffer *buffer) const\n> +int Stream::getBufferId(FrameBuffer *buffer) const\n> {\n> \tif (importOnly_)\n> \t\treturn -1;\n> @@ -68,12 +68,12 @@ int RPiStream::getBufferId(FrameBuffer *buffer) const\n> \treturn it->first;\n> }\n>\n> -void RPiStream::setExternalBuffer(FrameBuffer *buffer)\n> +void Stream::setExternalBuffer(FrameBuffer *buffer)\n> {\n> \tbufferMap_.emplace(RPiBufferMask::EXTERNAL_BUFFER | id_.get(), buffer);\n> }\n>\n> -void RPiStream::removeExternalBuffer(FrameBuffer *buffer)\n> +void Stream::removeExternalBuffer(FrameBuffer *buffer)\n> {\n> \tint id = getBufferId(buffer);\n>\n> @@ -82,7 +82,7 @@ void RPiStream::removeExternalBuffer(FrameBuffer *buffer)\n> \tbufferMap_.erase(id);\n> }\n>\n> -int RPiStream::prepareBuffers(unsigned int count)\n> +int Stream::prepareBuffers(unsigned int count)\n> {\n> \tint ret;\n>\n> @@ -108,7 +108,7 @@ int RPiStream::prepareBuffers(unsigned int count)\n> \treturn dev_->importBuffers(count);\n> }\n>\n> -int RPiStream::queueBuffer(FrameBuffer *buffer)\n> +int Stream::queueBuffer(FrameBuffer *buffer)\n> {\n> \t/*\n> \t * A nullptr buffer implies an external stream, but no external\n> @@ -147,7 +147,7 @@ int RPiStream::queueBuffer(FrameBuffer *buffer)\n> \treturn 0;\n> }\n>\n> -void RPiStream::returnBuffer(FrameBuffer *buffer)\n> +void Stream::returnBuffer(FrameBuffer *buffer)\n> {\n> \t/* This can only be called for external streams. */\n> \tASSERT(external_);\n> @@ -186,7 +186,7 @@ void RPiStream::returnBuffer(FrameBuffer *buffer)\n> \t}\n> }\n>\n> -int RPiStream::queueAllBuffers()\n> +int Stream::queueAllBuffers()\n> {\n> \tint ret;\n>\n> @@ -204,13 +204,13 @@ int RPiStream::queueAllBuffers()\n> \treturn 0;\n> }\n>\n> -void RPiStream::releaseBuffers()\n> +void Stream::releaseBuffers()\n> {\n> \tdev_->releaseBuffers();\n> \tclearBuffers();\n> }\n>\n> -void RPiStream::clearBuffers()\n> +void Stream::clearBuffers()\n> {\n> \tavailableBuffers_ = std::queue{};\n> \trequestBuffers_ = std::queue{};\n> @@ -219,7 +219,7 @@ void RPiStream::clearBuffers()\n> \tid_.reset();\n> }\n>\n> -int RPiStream::queueToDevice(FrameBuffer *buffer)\n> +int Stream::queueToDevice(FrameBuffer *buffer)\n> {\n> \tLOG(RPISTREAM, Debug) << \"Queuing buffer \" << getBufferId(buffer)\n> \t\t\t << \" for \" << name_;\n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> index a2c21bcd..cb097e1c 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> @@ -27,15 +27,15 @@ using BufferMap = std::unordered_map;\n> * Device stream abstraction for either an internal or external stream.\n> * Used for both Unicam and the ISP.\n> */\n> -class RPiStream : public Stream\n> +class Stream : public libcamera::Stream\n> {\n> public:\n> -\tRPiStream()\n> +\tStream()\n> \t\t: id_(RPiBufferMask::ID)\n> \t{\n> \t}\n>\n> -\tRPiStream(const char *name, MediaEntity *dev, bool importOnly = false)\n> +\tStream(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_(RPiBufferMask::ID)\n> \t{\n> @@ -155,7 +155,7 @@ private:\n> * streams indexed with an enum class.\n> */\n> template\n> -class RPiDevice : public std::array\n> +class Device : public std::array\n> {\n> private:\n> \tconstexpr auto index(E e) const noexcept\n> @@ -163,13 +163,13 @@ private:\n> \t\treturn static_cast>(e);\n> \t}\n> public:\n> -\tRPiStream &operator[](E e)\n> +\tStream &operator[](E e)\n> \t{\n> -\t\treturn std::array::operator[](index(e));\n> +\t\treturn std::array::operator[](index(e));\n> \t}\n> -\tconst RPiStream &operator[](E e) const\n> +\tconst Stream &operator[](E e) const\n> \t{\n> -\t\treturn std::array::operator[](index(e));\n> +\t\treturn std::array::operator[](index(e));\n> \t}\n> };\n>\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 2E6C1C3B5B\n\tfor ;\n\tWed, 23 Sep 2020 07:41:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AF1CA62FDC;\n\tWed, 23 Sep 2020 09:41:08 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7FFD460363\n\tfor ;\n\tWed, 23 Sep 2020 09:41:07 +0200 (CEST)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id EA63C1C000F;\n\tWed, 23 Sep 2020 07:41:06 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Wed, 23 Sep 2020 09:44:59 +0200","From":"Jacopo Mondi ","To":"Naushir Patuck ","Message-ID":"<20200923074459.niostc43hb5e3khd@uno.localdomain>","References":"<20200922095018.68434-1-naush@raspberrypi.com>\n\t<20200922095018.68434-2-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200922095018.68434-2-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH 1/4] pipeline: raspberrypi: Move\n\tRPiStream and RPiDevice to its own namespace","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12663,"web_url":"https://patchwork.libcamera.org/comment/12663/","msgid":"","date":"2020-09-23T11:01:38","subject":"Re: [libcamera-devel] [PATCH 1/4] pipeline: raspberrypi: Move\n\tRPiStream and RPiDevice to its own namespace","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Naush,\n\nOn 23/09/2020 08:44, Jacopo Mondi wrote:\n> Hi Naush,\n> \n> nit on subject: both classes are already in their own RPi namespace\n> You are just renaming them\n> \n> On Tue, Sep 22, 2020 at 10:50:15AM +0100, Naushir Patuck wrote:\n>> Rename RpiStream -> RPi::Stream and RPiDevice -> RPi::Device.\n> \n> Rename RPi::RPiStream -> RPi::Stream and RPi::RPiDevice -> RPi::Device\n>>\n>> There are no functional changes in this commit.\n>>\n>> Signed-off-by: Naushir Patuck \n> \n> Reviewed-by: Jacopo Mondi \n\nAgreed, the small clarification helps in the commit message, and perhaps\nthe title as otherwise it looks like this patch does more than it\nactually does.\n\nWith that updated:\n\nReviewed-by: Kieran Bingham \n\n\n\n> \n> Thanks\n> j\n> \n>> ---\n>> .../pipeline/raspberrypi/raspberrypi.cpp | 42 +++++++++----------\n>> .../pipeline/raspberrypi/rpi_stream.cpp | 34 +++++++--------\n>> .../pipeline/raspberrypi/rpi_stream.h | 16 +++----\n>> 3 files changed, 46 insertions(+), 46 deletions(-)\n>>\n>> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n>> index 50f07182..5ed74d51 100644\n>> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n>> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n>> @@ -150,16 +150,16 @@ public:\n>> \tvoid ispOutputDequeue(FrameBuffer *buffer);\n>>\n>> \tvoid clearIncompleteRequests();\n>> -\tvoid handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n>> -\tvoid handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n>> +\tvoid handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream);\n>> +\tvoid handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream);\n>> \tvoid handleState();\n>>\n>> \tCameraSensor *sensor_;\n>> \t/* Array of Unicam and ISP device streams and associated buffers/streams. */\n>> -\tRPi::RPiDevice unicam_;\n>> -\tRPi::RPiDevice isp_;\n>> +\tRPi::Device unicam_;\n>> +\tRPi::Device isp_;\n>> \t/* The vector below is just for convenience when iterating over all streams. */\n>> -\tstd::vector streams_;\n>> +\tstd::vector streams_;\n>> \t/* Stores the ids of the buffers mapped in the IPA. */\n>> \tstd::unordered_set ipaBuffers_;\n>>\n>> @@ -189,7 +189,7 @@ private:\n>> \tvoid tryRunPipeline();\n>> \tvoid tryFlushQueues();\n>> \tFrameBuffer *updateQueue(std::queue &q, uint64_t timestamp,\n>> -\t\t\t\t RPi::RPiStream *stream);\n>> +\t\t\t\t RPi::Stream *stream);\n>>\n>> \tunsigned int ispOutputCount_;\n>> };\n>> @@ -618,7 +618,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n>> int PipelineHandlerRPi::exportFrameBuffers([[maybe_unused]] Camera *camera, Stream *stream,\n>> \t\t\t\t\t std::vector> *buffers)\n>> {\n>> -\tRPi::RPiStream *s = static_cast(stream);\n>> +\tRPi::Stream *s = static_cast(stream);\n>> \tunsigned int count = stream->configuration().bufferCount;\n>> \tint ret = s->dev()->exportBuffers(count, buffers);\n>>\n>> @@ -787,14 +787,14 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n>> \t\treturn false;\n>>\n>> \t/* Locate and open the unicam video streams. */\n>> -\tdata->unicam_[Unicam::Embedded] = RPi::RPiStream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n>> -\tdata->unicam_[Unicam::Image] = RPi::RPiStream(\"Unicam Image\", unicam_->getEntityByName(\"unicam-image\"));\n>> +\tdata->unicam_[Unicam::Embedded] = RPi::Stream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n>> +\tdata->unicam_[Unicam::Image] = RPi::Stream(\"Unicam Image\", unicam_->getEntityByName(\"unicam-image\"));\n>>\n>> \t/* Tag the ISP input stream as an import stream. */\n>> -\tdata->isp_[Isp::Input] = RPi::RPiStream(\"ISP Input\", isp_->getEntityByName(\"bcm2835-isp0-output0\"), true);\n>> -\tdata->isp_[Isp::Output0] = RPi::RPiStream(\"ISP Output0\", isp_->getEntityByName(\"bcm2835-isp0-capture1\"));\n>> -\tdata->isp_[Isp::Output1] = RPi::RPiStream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n>> -\tdata->isp_[Isp::Stats] = RPi::RPiStream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n>> +\tdata->isp_[Isp::Input] = RPi::Stream(\"ISP Input\", isp_->getEntityByName(\"bcm2835-isp0-output0\"), true);\n>> +\tdata->isp_[Isp::Output0] = RPi::Stream(\"ISP Output0\", isp_->getEntityByName(\"bcm2835-isp0-capture1\"));\n>> +\tdata->isp_[Isp::Output1] = RPi::Stream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n>> +\tdata->isp_[Isp::Stats] = RPi::Stream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n>>\n>> \t/* This is just for convenience so that we can easily iterate over all streams. */\n>> \tfor (auto &stream : data->unicam_)\n>> @@ -912,7 +912,7 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n>> \t */\n>> \tunsigned int maxBuffers = 0;\n>> \tfor (const Stream *s : camera->streams())\n>> -\t\tif (static_cast(s)->isExternal())\n>> +\t\tif (static_cast(s)->isExternal())\n>> \t\t\tmaxBuffers = std::max(maxBuffers, s->configuration().bufferCount);\n>>\n>> \tfor (auto const stream : data->streams_) {\n>> @@ -1133,13 +1133,13 @@ done:\n>>\n>> void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n>> {\n>> -\tRPi::RPiStream *stream = nullptr;\n>> +\tRPi::Stream *stream = nullptr;\n>> \tint index;\n>>\n>> \tif (state_ == State::Stopped)\n>> \t\treturn;\n>>\n>> -\tfor (RPi::RPiStream &s : unicam_) {\n>> +\tfor (RPi::Stream &s : unicam_) {\n>> \t\tindex = s.getBufferId(buffer);\n>> \t\tif (index != -1) {\n>> \t\t\tstream = &s;\n>> @@ -1201,13 +1201,13 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer)\n>>\n>> void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n>> {\n>> -\tRPi::RPiStream *stream = nullptr;\n>> +\tRPi::Stream *stream = nullptr;\n>> \tint index;\n>>\n>> \tif (state_ == State::Stopped)\n>> \t\treturn;\n>>\n>> -\tfor (RPi::RPiStream &s : isp_) {\n>> +\tfor (RPi::Stream &s : isp_) {\n>> \t\tindex = s.getBufferId(buffer);\n>> \t\tif (index != -1) {\n>> \t\t\tstream = &s;\n>> @@ -1297,7 +1297,7 @@ void RPiCameraData::clearIncompleteRequests()\n>> \t}\n>> }\n>>\n>> -void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream)\n>> +void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n>> {\n>> \tif (stream->isExternal()) {\n>> \t\t/*\n>> @@ -1330,7 +1330,7 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stre\n>> \t}\n>> }\n>>\n>> -void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream)\n>> +void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n>> {\n>> \tunsigned int id = stream->getBufferId(buffer);\n>>\n>> @@ -1510,7 +1510,7 @@ void RPiCameraData::tryFlushQueues()\n>> }\n>>\n>> FrameBuffer *RPiCameraData::updateQueue(std::queue &q, uint64_t timestamp,\n>> -\t\t\t\t\tRPi::RPiStream *stream)\n>> +\t\t\t\t\tRPi::Stream *stream)\n>> {\n>> \t/*\n>> \t * If the unicam streams are external (both have be to the same), then we\n>> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n>> index 2dcf96ca..3ee859e9 100644\n>> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n>> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n>> @@ -14,46 +14,46 @@ LOG_DEFINE_CATEGORY(RPISTREAM)\n>>\n>> namespace RPi {\n>>\n>> -V4L2VideoDevice *RPiStream::dev() const\n>> +V4L2VideoDevice *Stream::dev() const\n>> {\n>> \treturn dev_.get();\n>> }\n>>\n>> -std::string RPiStream::name() const\n>> +std::string Stream::name() const\n>> {\n>> \treturn name_;\n>> }\n>>\n>> -void RPiStream::reset()\n>> +void Stream::reset()\n>> {\n>> \texternal_ = false;\n>> \tclearBuffers();\n>> }\n>>\n>> -void RPiStream::setExternal(bool external)\n>> +void Stream::setExternal(bool external)\n>> {\n>> \t/* Import streams cannot be external. */\n>> \tASSERT(!external || !importOnly_);\n>> \texternal_ = external;\n>> }\n>>\n>> -bool RPiStream::isExternal() const\n>> +bool Stream::isExternal() const\n>> {\n>> \treturn external_;\n>> }\n>>\n>> -void RPiStream::setExportedBuffers(std::vector> *buffers)\n>> +void Stream::setExportedBuffers(std::vector> *buffers)\n>> {\n>> \tfor (auto const &buffer : *buffers)\n>> \t\tbufferMap_.emplace(id_.get(), buffer.get());\n>> }\n>>\n>> -const BufferMap &RPiStream::getBuffers() const\n>> +const BufferMap &Stream::getBuffers() const\n>> {\n>> \treturn bufferMap_;\n>> }\n>>\n>> -int RPiStream::getBufferId(FrameBuffer *buffer) const\n>> +int Stream::getBufferId(FrameBuffer *buffer) const\n>> {\n>> \tif (importOnly_)\n>> \t\treturn -1;\n>> @@ -68,12 +68,12 @@ int RPiStream::getBufferId(FrameBuffer *buffer) const\n>> \treturn it->first;\n>> }\n>>\n>> -void RPiStream::setExternalBuffer(FrameBuffer *buffer)\n>> +void Stream::setExternalBuffer(FrameBuffer *buffer)\n>> {\n>> \tbufferMap_.emplace(RPiBufferMask::EXTERNAL_BUFFER | id_.get(), buffer);\n>> }\n>>\n>> -void RPiStream::removeExternalBuffer(FrameBuffer *buffer)\n>> +void Stream::removeExternalBuffer(FrameBuffer *buffer)\n>> {\n>> \tint id = getBufferId(buffer);\n>>\n>> @@ -82,7 +82,7 @@ void RPiStream::removeExternalBuffer(FrameBuffer *buffer)\n>> \tbufferMap_.erase(id);\n>> }\n>>\n>> -int RPiStream::prepareBuffers(unsigned int count)\n>> +int Stream::prepareBuffers(unsigned int count)\n>> {\n>> \tint ret;\n>>\n>> @@ -108,7 +108,7 @@ int RPiStream::prepareBuffers(unsigned int count)\n>> \treturn dev_->importBuffers(count);\n>> }\n>>\n>> -int RPiStream::queueBuffer(FrameBuffer *buffer)\n>> +int Stream::queueBuffer(FrameBuffer *buffer)\n>> {\n>> \t/*\n>> \t * A nullptr buffer implies an external stream, but no external\n>> @@ -147,7 +147,7 @@ int RPiStream::queueBuffer(FrameBuffer *buffer)\n>> \treturn 0;\n>> }\n>>\n>> -void RPiStream::returnBuffer(FrameBuffer *buffer)\n>> +void Stream::returnBuffer(FrameBuffer *buffer)\n>> {\n>> \t/* This can only be called for external streams. */\n>> \tASSERT(external_);\n>> @@ -186,7 +186,7 @@ void RPiStream::returnBuffer(FrameBuffer *buffer)\n>> \t}\n>> }\n>>\n>> -int RPiStream::queueAllBuffers()\n>> +int Stream::queueAllBuffers()\n>> {\n>> \tint ret;\n>>\n>> @@ -204,13 +204,13 @@ int RPiStream::queueAllBuffers()\n>> \treturn 0;\n>> }\n>>\n>> -void RPiStream::releaseBuffers()\n>> +void Stream::releaseBuffers()\n>> {\n>> \tdev_->releaseBuffers();\n>> \tclearBuffers();\n>> }\n>>\n>> -void RPiStream::clearBuffers()\n>> +void Stream::clearBuffers()\n>> {\n>> \tavailableBuffers_ = std::queue{};\n>> \trequestBuffers_ = std::queue{};\n>> @@ -219,7 +219,7 @@ void RPiStream::clearBuffers()\n>> \tid_.reset();\n>> }\n>>\n>> -int RPiStream::queueToDevice(FrameBuffer *buffer)\n>> +int Stream::queueToDevice(FrameBuffer *buffer)\n>> {\n>> \tLOG(RPISTREAM, Debug) << \"Queuing buffer \" << getBufferId(buffer)\n>> \t\t\t << \" for \" << name_;\n>> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n>> index a2c21bcd..cb097e1c 100644\n>> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n>> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n>> @@ -27,15 +27,15 @@ using BufferMap = std::unordered_map;\n>> * Device stream abstraction for either an internal or external stream.\n>> * Used for both Unicam and the ISP.\n>> */\n>> -class RPiStream : public Stream\n>> +class Stream : public libcamera::Stream\n>> {\n>> public:\n>> -\tRPiStream()\n>> +\tStream()\n>> \t\t: id_(RPiBufferMask::ID)\n>> \t{\n>> \t}\n>>\n>> -\tRPiStream(const char *name, MediaEntity *dev, bool importOnly = false)\n>> +\tStream(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_(RPiBufferMask::ID)\n>> \t{\n>> @@ -155,7 +155,7 @@ private:\n>> * streams indexed with an enum class.\n>> */\n>> template\n>> -class RPiDevice : public std::array\n>> +class Device : public std::array\n>> {\n>> private:\n>> \tconstexpr auto index(E e) const noexcept\n>> @@ -163,13 +163,13 @@ private:\n>> \t\treturn static_cast>(e);\n>> \t}\n>> public:\n>> -\tRPiStream &operator[](E e)\n>> +\tStream &operator[](E e)\n>> \t{\n>> -\t\treturn std::array::operator[](index(e));\n>> +\t\treturn std::array::operator[](index(e));\n>> \t}\n>> -\tconst RPiStream &operator[](E e) const\n>> +\tconst Stream &operator[](E e) const\n>> \t{\n>> -\t\treturn std::array::operator[](index(e));\n>> +\t\treturn std::array::operator[](index(e));\n>> \t}\n>> };\n>>\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\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel\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 BF7C1C3B5B\n\tfor ;\n\tWed, 23 Sep 2020 11:01:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 91E6A62FE6;\n\tWed, 23 Sep 2020 13:01:45 +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 4D4FC62FD2\n\tfor ;\n\tWed, 23 Sep 2020 13:01:44 +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 6B1C8555;\n\tWed, 23 Sep 2020 13:01:41 +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=\"LjHWHyvk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600858901;\n\tbh=VEPhs/JPW/JJoD073paqpLfzEMKk3I9y2RLj4uffpmU=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=LjHWHyvkiBcIGMwMS9gAsolziQdFnpfJ8rFetPzqfqNbL/yOpkkiEYF3Iq8P+4xYC\n\tkrieU7MngyrNY4zRo1Vka0UGnv0Eb8fZB02lvwo2Qj6dYZ+FiaxWKByeYAdvqFsyOX\n\tmj6o2INO+uoE3TkQYoy+zwyprcnheNxjb1gXE5gM=","To":"Jacopo Mondi , Naushir Patuck ","References":"<20200922095018.68434-1-naush@raspberrypi.com>\n\t<20200922095018.68434-2-naush@raspberrypi.com>\n\t<20200923074459.niostc43hb5e3khd@uno.localdomain>","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":"Wed, 23 Sep 2020 12:01:38 +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":"<20200923074459.niostc43hb5e3khd@uno.localdomain>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 1/4] pipeline: raspberrypi: Move\n\tRPiStream and RPiDevice to its own namespace","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":"libcamera-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":12712,"web_url":"https://patchwork.libcamera.org/comment/12712/","msgid":"","date":"2020-09-24T08:30:28","subject":"Re: [libcamera-devel] [PATCH 1/4] pipeline: raspberrypi: Move\n\tRPiStream and RPiDevice to its own namespace","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"Hi Kieran and Jacopo,\n\nThank you for the review. Entirely right, the commit message is\ncompletely misleading. Not sure where my mind was when I typed that\nin :) I will fix up and submit a v2 patch set.\n\nRegards,\nNaush\n\nOn Wed, 23 Sep 2020 at 12:01, Kieran Bingham\n wrote:\n>\n> Hi Naush,\n>\n> On 23/09/2020 08:44, Jacopo Mondi wrote:\n> > Hi Naush,\n> >\n> > nit on subject: both classes are already in their own RPi namespace\n> > You are just renaming them\n> >\n> > On Tue, Sep 22, 2020 at 10:50:15AM +0100, Naushir Patuck wrote:\n> >> Rename RpiStream -> RPi::Stream and RPiDevice -> RPi::Device.\n> >\n> > Rename RPi::RPiStream -> RPi::Stream and RPi::RPiDevice -> RPi::Device\n> >>\n> >> There are no functional changes in this commit.\n> >>\n> >> Signed-off-by: Naushir Patuck \n> >\n> > Reviewed-by: Jacopo Mondi \n>\n> Agreed, the small clarification helps in the commit message, and perhaps\n> the title as otherwise it looks like this patch does more than it\n> actually does.\n>\n> With that updated:\n>\n> Reviewed-by: Kieran Bingham \n>\n>\n>\n> >\n> > Thanks\n> > j\n> >\n> >> ---\n> >> .../pipeline/raspberrypi/raspberrypi.cpp | 42 +++++++++----------\n> >> .../pipeline/raspberrypi/rpi_stream.cpp | 34 +++++++--------\n> >> .../pipeline/raspberrypi/rpi_stream.h | 16 +++----\n> >> 3 files changed, 46 insertions(+), 46 deletions(-)\n> >>\n> >> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> >> index 50f07182..5ed74d51 100644\n> >> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> >> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> >> @@ -150,16 +150,16 @@ public:\n> >> void ispOutputDequeue(FrameBuffer *buffer);\n> >>\n> >> void clearIncompleteRequests();\n> >> - void handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n> >> - void handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream);\n> >> + void handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream);\n> >> + void handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream);\n> >> void handleState();\n> >>\n> >> CameraSensor *sensor_;\n> >> /* Array of Unicam and ISP device streams and associated buffers/streams. */\n> >> - RPi::RPiDevice unicam_;\n> >> - RPi::RPiDevice isp_;\n> >> + RPi::Device unicam_;\n> >> + RPi::Device isp_;\n> >> /* The vector below is just for convenience when iterating over all streams. */\n> >> - std::vector streams_;\n> >> + std::vector streams_;\n> >> /* Stores the ids of the buffers mapped in the IPA. */\n> >> std::unordered_set ipaBuffers_;\n> >>\n> >> @@ -189,7 +189,7 @@ private:\n> >> void tryRunPipeline();\n> >> void tryFlushQueues();\n> >> FrameBuffer *updateQueue(std::queue &q, uint64_t timestamp,\n> >> - RPi::RPiStream *stream);\n> >> + RPi::Stream *stream);\n> >>\n> >> unsigned int ispOutputCount_;\n> >> };\n> >> @@ -618,7 +618,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n> >> int PipelineHandlerRPi::exportFrameBuffers([[maybe_unused]] Camera *camera, Stream *stream,\n> >> std::vector> *buffers)\n> >> {\n> >> - RPi::RPiStream *s = static_cast(stream);\n> >> + RPi::Stream *s = static_cast(stream);\n> >> unsigned int count = stream->configuration().bufferCount;\n> >> int ret = s->dev()->exportBuffers(count, buffers);\n> >>\n> >> @@ -787,14 +787,14 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n> >> return false;\n> >>\n> >> /* Locate and open the unicam video streams. */\n> >> - data->unicam_[Unicam::Embedded] = RPi::RPiStream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n> >> - data->unicam_[Unicam::Image] = RPi::RPiStream(\"Unicam Image\", unicam_->getEntityByName(\"unicam-image\"));\n> >> + data->unicam_[Unicam::Embedded] = RPi::Stream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n> >> + data->unicam_[Unicam::Image] = RPi::Stream(\"Unicam Image\", unicam_->getEntityByName(\"unicam-image\"));\n> >>\n> >> /* Tag the ISP input stream as an import stream. */\n> >> - data->isp_[Isp::Input] = RPi::RPiStream(\"ISP Input\", isp_->getEntityByName(\"bcm2835-isp0-output0\"), true);\n> >> - data->isp_[Isp::Output0] = RPi::RPiStream(\"ISP Output0\", isp_->getEntityByName(\"bcm2835-isp0-capture1\"));\n> >> - data->isp_[Isp::Output1] = RPi::RPiStream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n> >> - data->isp_[Isp::Stats] = RPi::RPiStream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n> >> + data->isp_[Isp::Input] = RPi::Stream(\"ISP Input\", isp_->getEntityByName(\"bcm2835-isp0-output0\"), true);\n> >> + data->isp_[Isp::Output0] = RPi::Stream(\"ISP Output0\", isp_->getEntityByName(\"bcm2835-isp0-capture1\"));\n> >> + data->isp_[Isp::Output1] = RPi::Stream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n> >> + data->isp_[Isp::Stats] = RPi::Stream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n> >>\n> >> /* This is just for convenience so that we can easily iterate over all streams. */\n> >> for (auto &stream : data->unicam_)\n> >> @@ -912,7 +912,7 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n> >> */\n> >> unsigned int maxBuffers = 0;\n> >> for (const Stream *s : camera->streams())\n> >> - if (static_cast(s)->isExternal())\n> >> + if (static_cast(s)->isExternal())\n> >> maxBuffers = std::max(maxBuffers, s->configuration().bufferCount);\n> >>\n> >> for (auto const stream : data->streams_) {\n> >> @@ -1133,13 +1133,13 @@ done:\n> >>\n> >> void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n> >> {\n> >> - RPi::RPiStream *stream = nullptr;\n> >> + RPi::Stream *stream = nullptr;\n> >> int index;\n> >>\n> >> if (state_ == State::Stopped)\n> >> return;\n> >>\n> >> - for (RPi::RPiStream &s : unicam_) {\n> >> + for (RPi::Stream &s : unicam_) {\n> >> index = s.getBufferId(buffer);\n> >> if (index != -1) {\n> >> stream = &s;\n> >> @@ -1201,13 +1201,13 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer)\n> >>\n> >> void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n> >> {\n> >> - RPi::RPiStream *stream = nullptr;\n> >> + RPi::Stream *stream = nullptr;\n> >> int index;\n> >>\n> >> if (state_ == State::Stopped)\n> >> return;\n> >>\n> >> - for (RPi::RPiStream &s : isp_) {\n> >> + for (RPi::Stream &s : isp_) {\n> >> index = s.getBufferId(buffer);\n> >> if (index != -1) {\n> >> stream = &s;\n> >> @@ -1297,7 +1297,7 @@ void RPiCameraData::clearIncompleteRequests()\n> >> }\n> >> }\n> >>\n> >> -void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream)\n> >> +void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n> >> {\n> >> if (stream->isExternal()) {\n> >> /*\n> >> @@ -1330,7 +1330,7 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stre\n> >> }\n> >> }\n> >>\n> >> -void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::RPiStream *stream)\n> >> +void RPiCameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n> >> {\n> >> unsigned int id = stream->getBufferId(buffer);\n> >>\n> >> @@ -1510,7 +1510,7 @@ void RPiCameraData::tryFlushQueues()\n> >> }\n> >>\n> >> FrameBuffer *RPiCameraData::updateQueue(std::queue &q, uint64_t timestamp,\n> >> - RPi::RPiStream *stream)\n> >> + RPi::Stream *stream)\n> >> {\n> >> /*\n> >> * If the unicam streams are external (both have be to the same), then we\n> >> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> >> index 2dcf96ca..3ee859e9 100644\n> >> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> >> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> >> @@ -14,46 +14,46 @@ LOG_DEFINE_CATEGORY(RPISTREAM)\n> >>\n> >> namespace RPi {\n> >>\n> >> -V4L2VideoDevice *RPiStream::dev() const\n> >> +V4L2VideoDevice *Stream::dev() const\n> >> {\n> >> return dev_.get();\n> >> }\n> >>\n> >> -std::string RPiStream::name() const\n> >> +std::string Stream::name() const\n> >> {\n> >> return name_;\n> >> }\n> >>\n> >> -void RPiStream::reset()\n> >> +void Stream::reset()\n> >> {\n> >> external_ = false;\n> >> clearBuffers();\n> >> }\n> >>\n> >> -void RPiStream::setExternal(bool external)\n> >> +void Stream::setExternal(bool external)\n> >> {\n> >> /* Import streams cannot be external. */\n> >> ASSERT(!external || !importOnly_);\n> >> external_ = external;\n> >> }\n> >>\n> >> -bool RPiStream::isExternal() const\n> >> +bool Stream::isExternal() const\n> >> {\n> >> return external_;\n> >> }\n> >>\n> >> -void RPiStream::setExportedBuffers(std::vector> *buffers)\n> >> +void Stream::setExportedBuffers(std::vector> *buffers)\n> >> {\n> >> for (auto const &buffer : *buffers)\n> >> bufferMap_.emplace(id_.get(), buffer.get());\n> >> }\n> >>\n> >> -const BufferMap &RPiStream::getBuffers() const\n> >> +const BufferMap &Stream::getBuffers() const\n> >> {\n> >> return bufferMap_;\n> >> }\n> >>\n> >> -int RPiStream::getBufferId(FrameBuffer *buffer) const\n> >> +int Stream::getBufferId(FrameBuffer *buffer) const\n> >> {\n> >> if (importOnly_)\n> >> return -1;\n> >> @@ -68,12 +68,12 @@ int RPiStream::getBufferId(FrameBuffer *buffer) const\n> >> return it->first;\n> >> }\n> >>\n> >> -void RPiStream::setExternalBuffer(FrameBuffer *buffer)\n> >> +void Stream::setExternalBuffer(FrameBuffer *buffer)\n> >> {\n> >> bufferMap_.emplace(RPiBufferMask::EXTERNAL_BUFFER | id_.get(), buffer);\n> >> }\n> >>\n> >> -void RPiStream::removeExternalBuffer(FrameBuffer *buffer)\n> >> +void Stream::removeExternalBuffer(FrameBuffer *buffer)\n> >> {\n> >> int id = getBufferId(buffer);\n> >>\n> >> @@ -82,7 +82,7 @@ void RPiStream::removeExternalBuffer(FrameBuffer *buffer)\n> >> bufferMap_.erase(id);\n> >> }\n> >>\n> >> -int RPiStream::prepareBuffers(unsigned int count)\n> >> +int Stream::prepareBuffers(unsigned int count)\n> >> {\n> >> int ret;\n> >>\n> >> @@ -108,7 +108,7 @@ int RPiStream::prepareBuffers(unsigned int count)\n> >> return dev_->importBuffers(count);\n> >> }\n> >>\n> >> -int RPiStream::queueBuffer(FrameBuffer *buffer)\n> >> +int Stream::queueBuffer(FrameBuffer *buffer)\n> >> {\n> >> /*\n> >> * A nullptr buffer implies an external stream, but no external\n> >> @@ -147,7 +147,7 @@ int RPiStream::queueBuffer(FrameBuffer *buffer)\n> >> return 0;\n> >> }\n> >>\n> >> -void RPiStream::returnBuffer(FrameBuffer *buffer)\n> >> +void Stream::returnBuffer(FrameBuffer *buffer)\n> >> {\n> >> /* This can only be called for external streams. */\n> >> ASSERT(external_);\n> >> @@ -186,7 +186,7 @@ void RPiStream::returnBuffer(FrameBuffer *buffer)\n> >> }\n> >> }\n> >>\n> >> -int RPiStream::queueAllBuffers()\n> >> +int Stream::queueAllBuffers()\n> >> {\n> >> int ret;\n> >>\n> >> @@ -204,13 +204,13 @@ int RPiStream::queueAllBuffers()\n> >> return 0;\n> >> }\n> >>\n> >> -void RPiStream::releaseBuffers()\n> >> +void Stream::releaseBuffers()\n> >> {\n> >> dev_->releaseBuffers();\n> >> clearBuffers();\n> >> }\n> >>\n> >> -void RPiStream::clearBuffers()\n> >> +void Stream::clearBuffers()\n> >> {\n> >> availableBuffers_ = std::queue{};\n> >> requestBuffers_ = std::queue{};\n> >> @@ -219,7 +219,7 @@ void RPiStream::clearBuffers()\n> >> id_.reset();\n> >> }\n> >>\n> >> -int RPiStream::queueToDevice(FrameBuffer *buffer)\n> >> +int Stream::queueToDevice(FrameBuffer *buffer)\n> >> {\n> >> LOG(RPISTREAM, Debug) << \"Queuing buffer \" << getBufferId(buffer)\n> >> << \" for \" << name_;\n> >> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> >> index a2c21bcd..cb097e1c 100644\n> >> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> >> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> >> @@ -27,15 +27,15 @@ using BufferMap = std::unordered_map;\n> >> * Device stream abstraction for either an internal or external stream.\n> >> * Used for both Unicam and the ISP.\n> >> */\n> >> -class RPiStream : public Stream\n> >> +class Stream : public libcamera::Stream\n> >> {\n> >> public:\n> >> - RPiStream()\n> >> + Stream()\n> >> : id_(RPiBufferMask::ID)\n> >> {\n> >> }\n> >>\n> >> - RPiStream(const char *name, MediaEntity *dev, bool importOnly = false)\n> >> + Stream(const char *name, MediaEntity *dev, bool importOnly = false)\n> >> : external_(false), importOnly_(importOnly), name_(name),\n> >> dev_(std::make_unique(dev)), id_(RPiBufferMask::ID)\n> >> {\n> >> @@ -155,7 +155,7 @@ private:\n> >> * streams indexed with an enum class.\n> >> */\n> >> template\n> >> -class RPiDevice : public std::array\n> >> +class Device : public std::array\n> >> {\n> >> private:\n> >> constexpr auto index(E e) const noexcept\n> >> @@ -163,13 +163,13 @@ private:\n> >> return static_cast>(e);\n> >> }\n> >> public:\n> >> - RPiStream &operator[](E e)\n> >> + Stream &operator[](E e)\n> >> {\n> >> - return std::array::operator[](index(e));\n> >> + return std::array::operator[](index(e));\n> >> }\n> >> - const RPiStream &operator[](E e) const\n> >> + const Stream &operator[](E e) const\n> >> {\n> >> - return std::array::operator[](index(e));\n> >> + return std::array::operator[](index(e));\n> >> }\n> >> };\n> >>\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\n> > _______________________________________________\n> > libcamera-devel mailing list\n> > libcamera-devel@lists.libcamera.org\n> > https://lists.libcamera.org/listinfo/libcamera-devel\n> >\n>\n> --\n> Regards\n> --\n> Kieran","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 06C0EC3B5C\n\tfor ;\n\tThu, 24 Sep 2020 08:30:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7A87162FE3;\n\tThu, 24 Sep 2020 10:30:46 +0200 (CEST)","from mail-lf1-x142.google.com (mail-lf1-x142.google.com\n\t[IPv6:2a00:1450:4864:20::142])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6A67260362\n\tfor ;\n\tThu, 24 Sep 2020 10:30:45 +0200 (CEST)","by mail-lf1-x142.google.com with SMTP id z17so2891942lfi.12\n\tfor ;\n\tThu, 24 Sep 2020 01:30:45 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"fYjFO9mq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=NYoqXNua+ZtIn3yqXTOJk4sH9C8I8hgwnLxJ+7VIAno=;\n\tb=fYjFO9mqrypXa0w7kQzkP7EB8EXE0m/iFn9d6y8hpKfXu+DDCsJRy5rzzGFb80c664\n\t0qhv3g7tuOAqZuNHHI/SQHUgesheZmIulk6ezFVO57K+s3yrThjHCRVu/5poqjDfzwdD\n\txqEq3RHl2wAsYWZqbsagoMN2JFHd4RvGMRwN1WUnpwk2F5+PfSkX7NZ2JWpxmM6/GpPY\n\tQbXesDVCThKRzNyE68E2LlAKum0uSa7Emb/xS12mcGz5Kd8z7cR5KBrj9XMsZDpN07HZ\n\t3hApZUH56oNuOMll0pNzH8PKESj9DYtbVohwgBxTyldzaFnDOw046pHKRv5V8t1iDYRY\n\t8IGg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=NYoqXNua+ZtIn3yqXTOJk4sH9C8I8hgwnLxJ+7VIAno=;\n\tb=PBydGpee/OF97TZuX5BzhGlI+8dJXcwUiLdp7TR6TVOIimmCT5BLWzdhomniyBWZPi\n\tEYCJVvPQmPCeDx2wrBTGMRwXPxnBiIx+bZn1ir5ajaMfttsKvR/vGKrEl5EkOrCT8d0n\n\tbJyzxZ2Mo290CqIy/krp2pjay5ggefOQ43x0GCHBpXPy5SfTFxHASnnBUfkJu1emsIDO\n\tMjglGeRnNEwq7eLjVwT55jKlV7dKUmLTA6QttICtVJ5hqudauehRVrs260999bljTOE2\n\toa20bibcip1SZyZqFnwTmB7dXYGaxwZ6uCtblq9K0gWlHmPk10M6FcFzaJOsEYim10Rw\n\tsOUw==","X-Gm-Message-State":"AOAM5331pNCQmIgDCAw/1KDlyzYNyOneoRRL5xuseUFLxLbZtTDZrf3t\n\t+91tTl3pB2FqUSHsDXZBsf8qfMBoUfyVv47G3pc8kuhStFo=","X-Google-Smtp-Source":"ABdhPJzLHahDGOA9rUO+EChymYDhIGMxzzoP6mleeST5zyVh+x4mFfNawAHT43CtE7omSHZHPVIBwOHx8LX99OkaDo8=","X-Received":"by 2002:a19:418b:: with SMTP id\n\to133mr1326608lfa.413.1600936244369; \n\tThu, 24 Sep 2020 01:30:44 -0700 (PDT)","MIME-Version":"1.0","References":"<20200922095018.68434-1-naush@raspberrypi.com>\n\t<20200922095018.68434-2-naush@raspberrypi.com>\n\t<20200923074459.niostc43hb5e3khd@uno.localdomain>\n\t","In-Reply-To":"","From":"Naushir Patuck ","Date":"Thu, 24 Sep 2020 09:30:28 +0100","Message-ID":"","To":"Kieran Bingham ","Subject":"Re: [libcamera-devel] [PATCH 1/4] pipeline: raspberrypi: Move\n\tRPiStream and RPiDevice to its own namespace","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]