{"id":1626,"url":"https://patchwork.libcamera.org/api/1.1/patches/1626/?format=json","web_url":"https://patchwork.libcamera.org/patch/1626/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190704225334.26170-6-jacopo@jmondi.org>","date":"2019-07-04T22:53:30","name":"[libcamera-devel,5/9] libcamera: request: Rename the Stream to Buffer map","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"082720b837bf6eec9a62c1041bad7397820854ef","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1626/mbox/","series":[{"id":407,"url":"https://patchwork.libcamera.org/api/1.1/series/407/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=407","date":"2019-07-04T22:53:25","name":"Add support for external bufferes","version":1,"mbox":"https://patchwork.libcamera.org/series/407/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1626/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1626/checks/","tags":{},"headers":{"Return-Path":"","Received":["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 D511F60C2C\n\tfor ;\n\tFri, 5 Jul 2019 00:52:30 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 6174C1C0002;\n\tThu, 4 Jul 2019 22:52:29 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 5 Jul 2019 00:53:30 +0200","Message-Id":"<20190704225334.26170-6-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190704225334.26170-1-jacopo@jmondi.org>","References":"<20190704225334.26170-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 5/9] libcamera: request: Rename the Stream\n\tto 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":"Thu, 04 Jul 2019 22:52:31 -0000"},"content":"As we're about to add support for mapping application buffers to\nstreams' ones, rename the existing bufferMap_ to just buffers_, which\nalso matches the associated accessor operation name.\n\nSigned-off-by: Jacopo Mondi \nReviewed-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(-)","diff":"diff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex 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+\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_;\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 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 }\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 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","prefixes":["libcamera-devel","5/9"]}