[{"id":12472,"web_url":"https://patchwork.libcamera.org/comment/12472/","msgid":"<20200912143624.GB695456@oden.dyn.berto.se>","date":"2020-09-12T14:36:24","subject":"Re: [libcamera-devel] [PATCH v7 10/12] pipeline: raspberrypi: Use\n\tan unordered_map for the stream buffer list","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 work.\n\nOn 2020-09-08 08:49:10 +0100, Naushir Patuck wrote:\n> By using a map container, we can easily insert/remove buffers from the\n> buffer list. This will be required to track buffers allocated externally\n> and passed to the pipeline handler through a Request.\n> \n> Replace the buffer index tracking with an id generated internally by the\n> stream object.\n> \n> Signed-off-by: Naushir Patuck \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> .../pipeline/raspberrypi/raspberrypi.cpp | 23 ++++++---------\n> .../pipeline/raspberrypi/rpi_stream.cpp | 28 ++++++++++---------\n> .../pipeline/raspberrypi/rpi_stream.h | 14 +++++++---\n> 3 files changed, 34 insertions(+), 31 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 341ee6ce..6aa13034 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -890,7 +890,6 @@ int PipelineHandlerRPi::queueAllBuffers(Camera *camera)\n> int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n> {\n> \tRPiCameraData *data = cameraData(camera);\n> -\tunsigned int index;\n> \tint ret;\n> \n> \t/*\n> @@ -917,18 +916,14 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n> \t * This will allow us to identify buffers passed between the pipeline\n> \t * handler and the IPA.\n> \t */\n> -\tindex = 0;\n> \tfor (auto const &b : data->isp_[Isp::Stats].getBuffers()) {\n> -\t\tdata->ipaBuffers_.push_back({ .id = RPiIpaMask::STATS | index,\n> -\t\t\t\t\t .planes = b->planes() });\n> -\t\tindex++;\n> +\t\tdata->ipaBuffers_.push_back({ .id = RPiIpaMask::STATS | b.first,\n> +\t\t\t\t\t .planes = b.second->planes() });\n> \t}\n> \n> -\tindex = 0;\n> \tfor (auto const &b : data->unicam_[Unicam::Embedded].getBuffers()) {\n> -\t\tdata->ipaBuffers_.push_back({ .id = RPiIpaMask::EMBEDDED_DATA | index,\n> -\t\t\t\t\t .planes = b->planes() });\n> -\t\tindex++;\n> +\t\tdata->ipaBuffers_.push_back({ .id = RPiIpaMask::EMBEDDED_DATA | b.first,\n> +\t\t\t\t\t .planes = b.second->planes() });\n> \t}\n> \n> \tdata->ipa_->mapBuffers(data->ipaBuffers_);\n> @@ -1127,7 +1122,7 @@ void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n> \t\treturn;\n> \n> \tfor (RPi::RPiStream &s : unicam_) {\n> -\t\tindex = s.getBufferIndex(buffer);\n> +\t\tindex = s.getBufferId(buffer);\n> \t\tif (index != -1) {\n> \t\t\tstream = &s;\n> \t\t\tbreak;\n> @@ -1178,7 +1173,7 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer)\n> \t\treturn;\n> \n> \tLOG(RPI, Debug) << \"Stream ISP Input buffer complete\"\n> -\t\t\t<< \", buffer id \" << unicam_[Unicam::Image].getBufferIndex(buffer)\n> +\t\t\t<< \", buffer id \" << unicam_[Unicam::Image].getBufferId(buffer)\n> \t\t\t<< \", timestamp: \" << buffer->metadata().timestamp;\n> \n> \t/* The ISP input buffer gets re-queued into Unicam. */\n> @@ -1195,7 +1190,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n> \t\treturn;\n> \n> \tfor (RPi::RPiStream &s : isp_) {\n> -\t\tindex = s.getBufferIndex(buffer);\n> +\t\tindex = s.getBufferId(buffer);\n> \t\tif (index != -1) {\n> \t\t\tstream = &s;\n> \t\t\tbreak;\n> @@ -1432,8 +1427,8 @@ void RPiCameraData::tryRunPipeline()\n> \t/* Set our state to say the pipeline is active. */\n> \tstate_ = State::Busy;\n> \n> -\tunsigned int bayerIndex = unicam_[Unicam::Image].getBufferIndex(bayerBuffer);\n> -\tunsigned int embeddedIndex = unicam_[Unicam::Embedded].getBufferIndex(embeddedBuffer);\n> +\tunsigned int bayerIndex = unicam_[Unicam::Image].getBufferId(bayerBuffer);\n> +\tunsigned int embeddedIndex = unicam_[Unicam::Embedded].getBufferId(embeddedBuffer);\n> \n> \tLOG(RPI, Debug) << \"Signalling RPI_IPA_EVENT_SIGNAL_ISP_PREPARE:\"\n> \t\t\t<< \" Bayer buffer id: \" << bayerIndex\n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> index 80170d64..879e25ba 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> @@ -44,26 +44,28 @@ bool RPiStream::isExternal() const\n> \n> void RPiStream::setExportedBuffers(std::vector> *buffers)\n> {\n> -\tstd::transform(buffers->begin(), buffers->end(), std::back_inserter(bufferList_),\n> -\t\t [](std::unique_ptr &b) { return b.get(); });\n> +\tfor (auto const &buffer : *buffers)\n> +\t\tbufferMap_.emplace(id_++, buffer.get());\n> }\n> \n> -const std::vector &RPiStream::getBuffers() const\n> +const BufferMap &RPiStream::getBuffers() const\n> {\n> -\treturn bufferList_;\n> +\treturn bufferMap_;\n> }\n> \n> -int RPiStream::getBufferIndex(FrameBuffer *buffer) const\n> +int RPiStream::getBufferId(FrameBuffer *buffer) const\n> {\n> \tif (importOnly_)\n> \t\treturn -1;\n> \n> -\t/* Find the buffer in the list, and return the index position. */\n> -\tauto it = std::find(bufferList_.begin(), bufferList_.end(), buffer);\n> -\tif (it != bufferList_.end())\n> -\t\treturn std::distance(bufferList_.begin(), it);\n> +\t/* Find the buffer in the map, and return the buffer id. */\n> +\tauto it = std::find_if(bufferMap_.begin(), bufferMap_.end(),\n> +\t\t\t [&buffer](auto const &p) { return p.second == buffer; });\n> \n> -\treturn -1;\n> +\tif (it == bufferMap_.end())\n> +\t\treturn -1;\n> +\n> +\treturn it->first;\n> }\n> \n> int RPiStream::prepareBuffers(unsigned int count)\n> @@ -86,7 +88,7 @@ int RPiStream::prepareBuffers(unsigned int count)\n> \t\t}\n> \n> \t\t/* We must import all internal/external exported buffers. */\n> -\t\tcount = bufferList_.size();\n> +\t\tcount = bufferMap_.size();\n> \t}\n> \n> \treturn dev_->importBuffers(count);\n> @@ -196,12 +198,12 @@ void RPiStream::clearBuffers()\n> \tavailableBuffers_ = std::queue{};\n> \trequestBuffers_ = std::queue{};\n> \tinternalBuffers_.clear();\n> -\tbufferList_.clear();\n> +\tbufferMap_.clear();\n> }\n> \n> int RPiStream::queueToDevice(FrameBuffer *buffer)\n> {\n> -\tLOG(RPISTREAM, Debug) << \"Queuing buffer \" << getBufferIndex(buffer)\n> +\tLOG(RPISTREAM, Debug) << \"Queuing buffer \" << getBufferId(buffer)\n> \t\t\t << \" for \" << name_;\n> \n> \tint ret = dev_->queueBuffer(buffer);\n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> index 959e9147..ed517c22 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> @@ -9,6 +9,7 @@\n> \n> #include \n> #include \n> +#include \n> #include \n> \n> #include \n> @@ -19,6 +20,8 @@ namespace libcamera {\n> \n> namespace RPi {\n> \n> +using BufferMap = std::unordered_map;\n> +\n> /*\n> * Device stream abstraction for either an internal or external stream.\n> * Used for both Unicam and the ISP.\n> @@ -32,7 +35,7 @@ public:\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))\n> +\t\t dev_(std::make_unique(dev)), id_(0)\n> \t{\n> \t}\n> \n> @@ -45,8 +48,8 @@ public:\n> \tbool isExternal() const;\n> \n> \tvoid setExportedBuffers(std::vector> *buffers);\n> -\tconst std::vector &getBuffers() const;\n> -\tint getBufferIndex(FrameBuffer *buffer) const;\n> +\tconst BufferMap &getBuffers() const;\n> +\tint getBufferId(FrameBuffer *buffer) const;\n> \n> \tint prepareBuffers(unsigned int count);\n> \tint queueBuffer(FrameBuffer *buffer);\n> @@ -74,8 +77,11 @@ private:\n> \t/* The actual device stream. */\n> \tstd::unique_ptr dev_;\n> \n> +\t/* Tracks a unique id key for the bufferMap_ */\n> +\tunsigned int id_;\n> +\n> \t/* All frame buffers associated with this device stream. */\n> -\tstd::vector bufferList_;\n> +\tBufferMap bufferMap_;\n> \n> \t/*\n> \t * List of frame buffers that we can use if none have been provided by\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 C774EBF01C\n\tfor ;\n\tSat, 12 Sep 2020 14:36:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 56A0962D27;\n\tSat, 12 Sep 2020 16:36:27 +0200 (CEST)","from mail-lf1-x133.google.com (mail-lf1-x133.google.com\n\t[IPv6:2a00:1450:4864:20::133])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B590262C8C\n\tfor ;\n\tSat, 12 Sep 2020 16:36:25 +0200 (CEST)","by mail-lf1-x133.google.com with SMTP id u8so8820646lff.1\n\tfor ;\n\tSat, 12 Sep 2020 07:36:25 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\t134sm1040385lfd.101.2020.09.12.07.36.24\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 12 Sep 2020 07:36:24 -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=\"tBbtbh6z\"; 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=Jit4/6/if9YTgid7C52WigaZLDdW1VzHc7LKAJ5VOtk=;\n\tb=tBbtbh6zZQlX/lyZ1wvcF9PkigZipyHYMKq4JiZYjQvCQ6qcxO+8GuNZo6Htddky0q\n\tTVfjhzLF51oMOdQvMbfZslmRdbUfkFNp+wf/EjanPtmUv4MZ3nxlciQ32dd4OHo6n0rW\n\tGPqdh7N+1sqbIyswsbsMJCNRUu8adlEfSbceeskI2bC9M/bVK6gs/sQ4t4xZsTydC0rD\n\ttBQyfXp5nWVUTHS10PE6t5dsnFcV121chHQTsnQspCEQB7O0XU3V/CIANXszEe8Azh7+\n\tGMcGnkUgWa5zfuWm9vU/HhQ57dMxTHB82mQFhU6Y3kO20keyxFxr/2SyG//eLYZnmloL\n\tmV1A==","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=Jit4/6/if9YTgid7C52WigaZLDdW1VzHc7LKAJ5VOtk=;\n\tb=Suet915Ynh4CuMadFo6M0WlXIvIxoB759Yt0N8V81rEyv1bym37uNHXfdDVb/mlDGK\n\tyLrLNY7DBVJgZX309JnfvzsoYYjDj0JDbdnh3fvLORfqHh7XQSIrF/xN25QQamqOELeA\n\tULwN0cEK3UJZdunzzkzWl7Lw3kRFQYy6XoH34WoWYfSL4rVhICqWblJRjcAV8sZ2kuMz\n\tu6KSDGkgU5DgVkan762oRSMkDKrRZc39sOrGJkLtVp8UlA65FD81ZmwDKE6SHduBgdp8\n\tcjF7J/fYc8z0/fH8JejJHHDKgtMI2hji97aT82sL5pMFtdOOR1Qfx3gJ5M3cKyW0koln\n\tiihA==","X-Gm-Message-State":"AOAM530UAkYrvTcJQtXmqFYmmLYD0pvxwd57SxXAHBQxMqVmv+7DKBp3\n\tlN49CaiU+qMgY8E+7Hm5ZjMkww==","X-Google-Smtp-Source":"ABdhPJxxUBJHX7GSEUPOIaOLlh27zUwwgP+4Z3TrEqz7P9lNkNXl1ZbCjocZFjWKutHhex6XGuoVkw==","X-Received":"by 2002:ac2:4301:: with SMTP id l1mr1622400lfh.389.1599921385076;\n\tSat, 12 Sep 2020 07:36:25 -0700 (PDT)","Date":"Sat, 12 Sep 2020 16:36:24 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Naushir Patuck ","Message-ID":"<20200912143624.GB695456@oden.dyn.berto.se>","References":"<20200908074913.109244-1-naush@raspberrypi.com>\n\t<20200908074913.109244-11-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200908074913.109244-11-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v7 10/12] pipeline: raspberrypi: Use\n\tan unordered_map for the stream buffer list","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\" "}},{"id":12522,"web_url":"https://patchwork.libcamera.org/comment/12522/","msgid":"<1e4a362b-462f-178b-90fc-6bdfb2297e92@ideasonboard.com>","date":"2020-09-15T13:40:31","subject":"Re: [libcamera-devel] [PATCH v7 10/12] pipeline: raspberrypi: Use\n\tan unordered_map for the stream buffer list","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Naush,\n\nOn 08/09/2020 08:49, Naushir Patuck wrote:\n> By using a map container, we can easily insert/remove buffers from the\n> buffer list. This will be required to track buffers allocated externally\n> and passed to the pipeline handler through a Request.\n> \n> Replace the buffer index tracking with an id generated internally by the\n> stream object.\n> \n> Signed-off-by: Naushir Patuck \n> ---\n> .../pipeline/raspberrypi/raspberrypi.cpp | 23 ++++++---------\n> .../pipeline/raspberrypi/rpi_stream.cpp | 28 ++++++++++---------\n> .../pipeline/raspberrypi/rpi_stream.h | 14 +++++++---\n> 3 files changed, 34 insertions(+), 31 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index 341ee6ce..6aa13034 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -890,7 +890,6 @@ int PipelineHandlerRPi::queueAllBuffers(Camera *camera)\n> int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n> {\n> \tRPiCameraData *data = cameraData(camera);\n> -\tunsigned int index;\n> \tint ret;\n> \n> \t/*\n> @@ -917,18 +916,14 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n> \t * This will allow us to identify buffers passed between the pipeline\n> \t * handler and the IPA.\n> \t */\n> -\tindex = 0;\n> \tfor (auto const &b : data->isp_[Isp::Stats].getBuffers()) {\n> -\t\tdata->ipaBuffers_.push_back({ .id = RPiIpaMask::STATS | index,\n> -\t\t\t\t\t .planes = b->planes() });\n> -\t\tindex++;\n> +\t\tdata->ipaBuffers_.push_back({ .id = RPiIpaMask::STATS | b.first,\n> +\t\t\t\t\t .planes = b.second->planes() });\n> \t}\n> \n> -\tindex = 0;\n> \tfor (auto const &b : data->unicam_[Unicam::Embedded].getBuffers()) {\n> -\t\tdata->ipaBuffers_.push_back({ .id = RPiIpaMask::EMBEDDED_DATA | index,\n> -\t\t\t\t\t .planes = b->planes() });\n> -\t\tindex++;\n> +\t\tdata->ipaBuffers_.push_back({ .id = RPiIpaMask::EMBEDDED_DATA | b.first,\n> +\t\t\t\t\t .planes = b.second->planes() });\n> \t}\n> \n> \tdata->ipa_->mapBuffers(data->ipaBuffers_);\n> @@ -1127,7 +1122,7 @@ void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n> \t\treturn;\n> \n> \tfor (RPi::RPiStream &s : unicam_) {\n> -\t\tindex = s.getBufferIndex(buffer);\n> +\t\tindex = s.getBufferId(buffer);\n> \t\tif (index != -1) {\n> \t\t\tstream = &s;\n> \t\t\tbreak;\n> @@ -1178,7 +1173,7 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer)\n> \t\treturn;\n> \n> \tLOG(RPI, Debug) << \"Stream ISP Input buffer complete\"\n> -\t\t\t<< \", buffer id \" << unicam_[Unicam::Image].getBufferIndex(buffer)\n> +\t\t\t<< \", buffer id \" << unicam_[Unicam::Image].getBufferId(buffer)\n> \t\t\t<< \", timestamp: \" << buffer->metadata().timestamp;\n> \n> \t/* The ISP input buffer gets re-queued into Unicam. */\n> @@ -1195,7 +1190,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n> \t\treturn;\n> \n> \tfor (RPi::RPiStream &s : isp_) {\n> -\t\tindex = s.getBufferIndex(buffer);\n> +\t\tindex = s.getBufferId(buffer);\n> \t\tif (index != -1) {\n> \t\t\tstream = &s;\n> \t\t\tbreak;\n> @@ -1432,8 +1427,8 @@ void RPiCameraData::tryRunPipeline()\n> \t/* Set our state to say the pipeline is active. */\n> \tstate_ = State::Busy;\n> \n> -\tunsigned int bayerIndex = unicam_[Unicam::Image].getBufferIndex(bayerBuffer);\n> -\tunsigned int embeddedIndex = unicam_[Unicam::Embedded].getBufferIndex(embeddedBuffer);\n> +\tunsigned int bayerIndex = unicam_[Unicam::Image].getBufferId(bayerBuffer);\n> +\tunsigned int embeddedIndex = unicam_[Unicam::Embedded].getBufferId(embeddedBuffer);\n\nWe assign an ID to an Index here, but I don't think it matters too much.\n\nReviewed-by: Kieran Bingham \n\n> \n> \tLOG(RPI, Debug) << \"Signalling RPI_IPA_EVENT_SIGNAL_ISP_PREPARE:\"\n> \t\t\t<< \" Bayer buffer id: \" << bayerIndex\n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> index 80170d64..879e25ba 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n> @@ -44,26 +44,28 @@ bool RPiStream::isExternal() const\n> \n> void RPiStream::setExportedBuffers(std::vector> *buffers)\n> {\n> -\tstd::transform(buffers->begin(), buffers->end(), std::back_inserter(bufferList_),\n> -\t\t [](std::unique_ptr &b) { return b.get(); });\n> +\tfor (auto const &buffer : *buffers)\n> +\t\tbufferMap_.emplace(id_++, buffer.get());\n> }\n> \n> -const std::vector &RPiStream::getBuffers() const\n> +const BufferMap &RPiStream::getBuffers() const\n> {\n> -\treturn bufferList_;\n> +\treturn bufferMap_;\n> }\n> \n> -int RPiStream::getBufferIndex(FrameBuffer *buffer) const\n> +int RPiStream::getBufferId(FrameBuffer *buffer) const\n> {\n> \tif (importOnly_)\n> \t\treturn -1;\n> \n> -\t/* Find the buffer in the list, and return the index position. */\n> -\tauto it = std::find(bufferList_.begin(), bufferList_.end(), buffer);\n> -\tif (it != bufferList_.end())\n> -\t\treturn std::distance(bufferList_.begin(), it);\n> +\t/* Find the buffer in the map, and return the buffer id. */\n> +\tauto it = std::find_if(bufferMap_.begin(), bufferMap_.end(),\n> +\t\t\t [&buffer](auto const &p) { return p.second == buffer; });\n> \n> -\treturn -1;\n> +\tif (it == bufferMap_.end())\n> +\t\treturn -1;\n> +\n> +\treturn it->first;\n> }\n> \n> int RPiStream::prepareBuffers(unsigned int count)\n> @@ -86,7 +88,7 @@ int RPiStream::prepareBuffers(unsigned int count)\n> \t\t}\n> \n> \t\t/* We must import all internal/external exported buffers. */\n> -\t\tcount = bufferList_.size();\n> +\t\tcount = bufferMap_.size();\n> \t}\n> \n> \treturn dev_->importBuffers(count);\n> @@ -196,12 +198,12 @@ void RPiStream::clearBuffers()\n> \tavailableBuffers_ = std::queue{};\n> \trequestBuffers_ = std::queue{};\n> \tinternalBuffers_.clear();\n> -\tbufferList_.clear();\n> +\tbufferMap_.clear();\n> }\n> \n> int RPiStream::queueToDevice(FrameBuffer *buffer)\n> {\n> -\tLOG(RPISTREAM, Debug) << \"Queuing buffer \" << getBufferIndex(buffer)\n> +\tLOG(RPISTREAM, Debug) << \"Queuing buffer \" << getBufferId(buffer)\n> \t\t\t << \" for \" << name_;\n> \n> \tint ret = dev_->queueBuffer(buffer);\n> diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> index 959e9147..ed517c22 100644\n> --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n> @@ -9,6 +9,7 @@\n> \n> #include \n> #include \n> +#include \n> #include \n> \n> #include \n> @@ -19,6 +20,8 @@ namespace libcamera {\n> \n> namespace RPi {\n> \n> +using BufferMap = std::unordered_map;\n> +\n> /*\n> * Device stream abstraction for either an internal or external stream.\n> * Used for both Unicam and the ISP.\n> @@ -32,7 +35,7 @@ public:\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))\n> +\t\t dev_(std::make_unique(dev)), id_(0)\n> \t{\n> \t}\n> \n> @@ -45,8 +48,8 @@ public:\n> \tbool isExternal() const;\n> \n> \tvoid setExportedBuffers(std::vector> *buffers);\n> -\tconst std::vector &getBuffers() const;\n> -\tint getBufferIndex(FrameBuffer *buffer) const;\n> +\tconst BufferMap &getBuffers() const;\n> +\tint getBufferId(FrameBuffer *buffer) const;\n> \n> \tint prepareBuffers(unsigned int count);\n> \tint queueBuffer(FrameBuffer *buffer);\n> @@ -74,8 +77,11 @@ private:\n> \t/* The actual device stream. */\n> \tstd::unique_ptr dev_;\n> \n> +\t/* Tracks a unique id key for the bufferMap_ */\n> +\tunsigned int id_;\n> +\n> \t/* All frame buffers associated with this device stream. */\n> -\tstd::vector bufferList_;\n> +\tBufferMap bufferMap_;\n> \n> \t/*\n> \t * List of frame buffers that we can use if none have been provided by\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 96442C3B5B\n\tfor ;\n\tTue, 15 Sep 2020 13:40:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F171562E0B;\n\tTue, 15 Sep 2020 15:40:40 +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 465896036C\n\tfor ;\n\tTue, 15 Sep 2020 15:40:39 +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 5656E275;\n\tTue, 15 Sep 2020 15:40:34 +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=\"OeY0IjTT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600177234;\n\tbh=h5V1OUsYxKrewUFhPrikylZ4tJJOKkhMruPFE8RRWws=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=OeY0IjTT3uw3y8o9vuE1Sw5r9uZaMOLd76uZFDbyDJjJfib+GBi0nZjZM78eEhDYD\n\tlEyIaracEADDgpPCDXEmK4YVXLpKqMcOrmNAjO8FUWMPw0NbSTaZ/WBNVoGUHJ+jwT\n\trAqTdsJRFy9m9qSEbbor+NfmSNFFMN0RR/9zouXo=","To":"Naushir Patuck ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200908074913.109244-1-naush@raspberrypi.com>\n\t<20200908074913.109244-11-naush@raspberrypi.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\tmQINBFYE/WYBEACs1PwjMD9rgCu1hlIiUA1AXR4rv2v+BCLUq//vrX5S5bjzxKAryRf0uHat\n\tV/zwz6hiDrZuHUACDB7X8OaQcwhLaVlq6byfoBr25+hbZG7G3+5EUl9cQ7dQEdvNj6V6y/SC\n\trRanWfelwQThCHckbobWiQJfK9n7rYNcPMq9B8e9F020LFH7Kj6YmO95ewJGgLm+idg1Kb3C\n\tpotzWkXc1xmPzcQ1fvQMOfMwdS+4SNw4rY9f07Xb2K99rjMwZVDgESKIzhsDB5GY465sCsiQ\n\tcSAZRxqE49RTBq2+EQsbrQpIc8XiffAB8qexh5/QPzCmR4kJgCGeHIXBtgRj+nIkCJPZvZtf\n\tKr2EAbc6tgg6DkAEHJb+1okosV09+0+TXywYvtEop/WUOWQ+zo+Y/OBd+8Ptgt1pDRyOBzL8\n\tRXa8ZqRf0Mwg75D+dKntZeJHzPRJyrlfQokngAAs4PaFt6UfS+ypMAF37T6CeDArQC41V3ko\n\tlPn1yMsVD0p+6i3DPvA/GPIksDC4owjnzVX9kM8Zc5Cx+XoAN0w5Eqo4t6qEVbuettxx55gq\n\t8K8FieAjgjMSxngo/HST8TpFeqI5nVeq0/lqtBRQKumuIqDg+Bkr4L1V/PSB6XgQcOdhtd36\n\tOe9X9dXB8YSNt7VjOcO7BTmFn/Z8r92mSAfHXpb07YJWJosQOQARAQABtDBLaWVyYW4gQmlu\n\tZ2hhbSA8a2llcmFuLmJpbmdoYW1AaWRlYXNvbmJvYXJkLmNvbT6JAlcEEwEKAEECGwMFCwkI\n\tBwIGFQgJCgsCBBYCAwECHgECF4ACGQEWIQSQLdeYP70o/eNy1HqhHkZyEKRh/QUCXWTtygUJ\n\tCyJXZAAKCRChHkZyEKRh/f8dEACTDsbLN2nioNZMwyLuQRUAFcXNolDX48xcUXsWS2QjxaPm\n\tVsJx8Uy8aYkS85mdPBh0C83OovQR/OVbr8AxhGvYqBs3nQvbWuTl/+4od7DfK2VZOoKBAu5S\n\tQK2FYuUcikDqYcFWJ8DQnubxfE8dvzojHEkXw0sA4igINHDDFX3HJGZtLio+WpEFQtCbfTAG\n\tYZslasz1YZRbwEdSsmO3/kqy5eMnczlm8a21A3fKUo3g8oAZEFM+f4DUNzqIltg31OAB/kZS\n\tenKZQ/SWC8PmLg/ZXBrReYakxXtkP6w3FwMlzOlhGxqhIRNiAJfXJBaRhuUWzPOpEDE9q5YJ\n\tBmqQL2WJm1VSNNVxbXJHpaWMH1sA2R00vmvRrPXGwyIO0IPYeUYQa3gsy6k+En/aMQJd27dp\n\taScf9am9PFICPY5T4ppneeJLif2lyLojo0mcHOV+uyrds9XkLpp14GfTkeKPdPMrLLTsHRfH\n\tfA4I4OBpRrEPiGIZB/0im98MkGY/Mu6qxeZmYLCcgD6qz4idOvfgVOrNh+aA8HzIVR+RMW8H\n\tQGBN9f0E3kfwxuhl3omo6V7lDw8XOdmuWZNC9zPq1UfryVHANYbLGz9KJ4Aw6M+OgBC2JpkD\n\thXMdHUkC+d20dwXrwHTlrJi1YNp6rBc+xald3wsUPOZ5z8moTHUX/uPA/qhGsbkCDQRWBP1m\n\tARAAzijkb+Sau4hAncr1JjOY+KyFEdUNxRy+hqTJdJfaYihxyaj0Ee0P0zEi35CbE6lgU0Uz\n\ttih9fiUbSV3wfsWqg1Ut3/5rTKu7kLFp15kF7eqvV4uezXRD3Qu4yjv/rMmEJbbD4cTvGCYI\n\td6MDC417f7vK3hCbCVIZSp3GXxyC1LU+UQr3fFcOyCwmP9vDUR9JV0BSqHHxRDdpUXE26Dk6\n\tmhf0V1YkspE5St814ETXpEus2urZE5yJIUROlWPIL+hm3NEWfAP06vsQUyLvr/GtbOT79vXl\n\tEn1aulcYyu20dRRxhkQ6iILaURcxIAVJJKPi8dsoMnS8pB0QW12AHWuirPF0g6DiuUfPmrA5\n\tPKe56IGlpkjc8cO51lIxHkWTpCMWigRdPDexKX+Sb+W9QWK/0JjIc4t3KBaiG8O4yRX8ml2R\n\t+rxfAVKM6V769P/hWoRGdgUMgYHFpHGSgEt80OKK5HeUPy2cngDUXzwrqiM5Sz6Od0qw5pCk\n\tNlXqI0W/who0iSVM+8+RmyY0OEkxEcci7rRLsGnM15B5PjLJjh1f2ULYkv8s4SnDwMZ/kE04\n\t/UqCMK/KnX8pwXEMCjz0h6qWNpGwJ0/tYIgQJZh6bqkvBrDogAvuhf60Sogw+mH8b+PBlx1L\n\toeTK396wc+4c3BfiC6pNtUS5GpsPMMjYMk7kVvEAEQEAAYkCPAQYAQoAJgIbDBYhBJAt15g/\n\tvSj943LUeqEeRnIQpGH9BQJdizzIBQkLSKZiAAoJEKEeRnIQpGH9eYgQAJpjaWNgqNOnMTmD\n\tMJggbwjIotypzIXfhHNCeTkG7+qCDlSaBPclcPGYrTwCt0YWPU2TgGgJrVhYT20ierN8LUvj\n\t6qOPTd+Uk7NFzL65qkh80ZKNBFddx1AabQpSVQKbdcLb8OFs85kuSvFdgqZwgxA1vl4TFhNz\n\tPZ79NAmXLackAx3sOVFhk4WQaKRshCB7cSl+RIng5S/ThOBlwNlcKG7j7W2MC06BlTbdEkUp\n\tECzuuRBv8wX4OQl+hbWbB/VKIx5HKlLu1eypen/5lNVzSqMMIYkkZcjV2SWQyUGxSwq0O/sx\n\tS0A8/atCHUXOboUsn54qdxrVDaK+6jIAuo8JiRWctP16KjzUM7MO0/+4zllM8EY57rXrj48j\n\tsbEYX0YQnzaj+jO6kJtoZsIaYR7rMMq9aUAjyiaEZpmP1qF/2sYenDx0Fg2BSlLvLvXM0vU8\n\tpQk3kgDu7kb/7PRYrZvBsr21EIQoIjXbZxDz/o7z95frkP71EaICttZ6k9q5oxxA5WC6sTXc\n\tMW8zs8avFNuA9VpXt0YupJd2ijtZy2mpZNG02fFVXhIn4G807G7+9mhuC4XG5rKlBBUXTvPU\n\tAfYnB4JBDLmLzBFavQfvonSfbitgXwCG3vS+9HEwAjU30Bar1PEOmIbiAoMzuKeRm2LVpmq4\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<1e4a362b-462f-178b-90fc-6bdfb2297e92@ideasonboard.com>","Date":"Tue, 15 Sep 2020 14:40:31 +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":"<20200908074913.109244-11-naush@raspberrypi.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v7 10/12] pipeline: raspberrypi: Use\n\tan unordered_map for the stream buffer list","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\" "}}]