[{"id":2187,"web_url":"https://patchwork.libcamera.org/comment/2187/","msgid":"<91640fcc-e2cb-db31-3290-485f4d2b79bc@ideasonboard.com>","date":"2019-07-08T09:44:19","subject":"Re: [libcamera-devel] [PATCH 5/9] libcamera: request: Rename the\n\tStream to Buffer map","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 04/07/2019 23:53, Jacopo Mondi wrote:\n> As we're about to add support for mapping application buffers to\n> streams' ones, rename the existing bufferMap_ to just buffers_, which\n> also matches the associated accessor operation name.\n> \n> Signed-off-by: Jacopo Mondi \n> Reviewed-by: Niklas Söderlund \n> ---\n> include/libcamera/request.h | 4 ++--\n> src/libcamera/camera.cpp | 2 +-\n> src/libcamera/request.cpp | 16 ++++++++--------\n> 3 files changed, 11 insertions(+), 11 deletions(-)\n> \n> diff --git a/include/libcamera/request.h b/include/libcamera/request.h\n> index a93468d7c8b7..70f6d7fa7eeb 100644\n> --- a/include/libcamera/request.h\n> +++ b/include/libcamera/request.h\n> @@ -34,7 +34,7 @@ public:\n> \tRequest &operator=(const Request &) = delete;\n> \n> \tControlList &controls() { return controls_; }\n> -\tconst std::map &buffers() const { return bufferMap_; }\n\nI think it might be good to add a\n\n 'using BufferMap = std::map;\n\ninto stream.h somewhere...\n\nThen this would be\n\n const BufferMap &buffers() const { return buffers_; }\n\nOr potentially StreamBufferMap might work too...\n\nIs that something that could be done at the same time as this patch? Or\nshould that be separate?\n\nOtherwise, I think especially as the accessor is called Buffers(),\nrenaming this makes sense.\n\n\n> +\tconst std::map &buffers() const { return buffers_; }\n> \tint setBuffers(const std::map &streamMap);\n> \tBuffer *findBuffer(Stream *stream) const;\n> \n> @@ -53,7 +53,7 @@ private:\n> \n> \tCamera *camera_;\n> \tControlList controls_;\n> -\tstd::map bufferMap_;\n> +\tstd::map buffers_;\n> \tstd::unordered_set pending_;\n> \n> \tStatus status_;\n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index f3f01d040ecf..265755f1b9e3 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -895,7 +895,7 @@ int Camera::stop()\n> */\n> void Camera::requestComplete(Request *request)\n> {\n> -\tstd::map buffers(std::move(request->bufferMap_));\n> +\tstd::map buffers(std::move(request->buffers_));\n> \trequestCompleted.emit(request, buffers);\n> \tdelete request;\n> }\n> diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\n> index f0b5985814bd..9ff0abbf119c 100644\n> --- a/src/libcamera/request.cpp\n> +++ b/src/libcamera/request.cpp\n> @@ -86,20 +86,20 @@ Request::Request(Camera *camera)\n> */\n> int Request::setBuffers(const std::map &streamMap)\n> {\n> -\tif (!bufferMap_.empty()) {\n> +\tif (!buffers_.empty()) {\n> \t\tLOG(Request, Error) << \"Buffers already set\";\n> \t\treturn -EBUSY;\n> \t}\n> \n> -\tbufferMap_ = streamMap;\n> +\tbuffers_ = streamMap;\n> \treturn 0;\n> }\n> \n> /**\n> - * \\var Request::bufferMap_\n> + * \\var Request::buffers_\n> * \\brief Mapping of streams to buffers for this request\n> *\n> - * The bufferMap_ tracks the buffers associated with each stream. If a stream is\n> + * The buffers_ tracks the buffers associated with each stream. If a stream is\n> * not utilised in this request there will be no buffer for that stream in the\n> * map.\n> */\n> @@ -112,8 +112,8 @@ int Request::setBuffers(const std::map &streamMap)\n> */\n> Buffer *Request::findBuffer(Stream *stream) const\n> {\n> -\tauto it = bufferMap_.find(stream);\n> -\tif (it == bufferMap_.end())\n> +\tauto it = buffers_.find(stream);\n> +\tif (it == buffers_.end())\n> \t\treturn nullptr;\n> \n> \treturn it->second;\n> @@ -150,12 +150,12 @@ Buffer *Request::findBuffer(Stream *stream) const\n> */\n> int Request::prepare()\n> {\n> -\tif (bufferMap_.empty()) {\n> +\tif (buffers_.empty()) {\n> \t\tLOG(Request, Error) << \"Invalid request due to missing buffers\";\n> \t\treturn -EINVAL;\n> \t}\n> \n> -\tfor (auto const &pair : bufferMap_) {\n> +\tfor (auto const &pair : buffers_) {\n> \t\tBuffer *buffer = pair.second;\n> \t\tbuffer->setRequest(this);\n> \t\tpending_.insert(buffer);\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8FBE660BC8\n\tfor ;\n\tMon, 8 Jul 2019 11:44:22 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E760C56A;\n\tMon, 8 Jul 2019 11:44:21 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1562579062;\n\tbh=STrO6rD1dMoVvAKTus5upfbs0D5B5dMxFUWulbhVtHs=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=S19SZTDf2k/UfCS/ktACHQl7/s03FHJbrVjXMecp6sVMOFGb8opdtRn/2jOo0bhFm\n\t7+auMycFxksTBUvEscMkl23vPfQ3yOLP6Rqi3uYSCwuKk+22pc0AYflSM9fekPiZ2+\n\tE0ssYeKukdT7CsSUx6n5KrThZtejo1lCdbmuzM0U=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20190704225334.26170-1-jacopo@jmondi.org>\n\t<20190704225334.26170-6-jacopo@jmondi.org>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<91640fcc-e2cb-db31-3290-485f4d2b79bc@ideasonboard.com>","Date":"Mon, 8 Jul 2019 10:44:19 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.7.1","MIME-Version":"1.0","In-Reply-To":"<20190704225334.26170-6-jacopo@jmondi.org>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 5/9] libcamera: request: Rename the\n\tStream to Buffer map","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 08 Jul 2019 09:44:22 -0000"}}]