Patch Detail
Show a patch.
GET /api/1.1/patches/1538/?format=api
{ "id": 1538, "url": "https://patchwork.libcamera.org/api/1.1/patches/1538/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1538/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190630181049.9548-6-jacopo@jmondi.org>", "date": "2019-06-30T18:10:46", "name": "[libcamera-devel,RFC,5/8] libcamera: request: Rename the Stream to Buffer map", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7e3abb308c71beb083ede081a9d4f58aa4a60b9c", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1538/mbox/", "series": [ { "id": 383, "url": "https://patchwork.libcamera.org/api/1.1/series/383/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=383", "date": "2019-06-30T18:10:41", "name": "libcamera: Add support for importing external memory buffers", "version": 1, "mbox": "https://patchwork.libcamera.org/series/383/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1538/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1538/checks/", "tags": {}, "headers": { "Return-Path": "<jacopo@jmondi.org>", "Received": [ "from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4852861F28\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 30 Jun 2019 20:09:40 +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 relay12.mail.gandi.net (Postfix) with ESMTPSA id E0F46200003;\n\tSun, 30 Jun 2019 18:09:39 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 30 Jun 2019 20:10:46 +0200", "Message-Id": "<20190630181049.9548-6-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190630181049.9548-1-jacopo@jmondi.org>", "References": "<20190630181049.9548-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC 5/8] 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Sun, 30 Jun 2019 18:09:40 -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 <jacopo@jmondi.org>\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 58de6f00a554..7adb753b2706 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -32,7 +32,7 @@ public:\n \tRequest(const Request &) = delete;\n \tRequest &operator=(const Request &) = delete;\n \n-\tconst std::map<Stream *, Buffer *> &buffers() const { return bufferMap_; }\n+\tconst std::map<Stream *, Buffer *> &buffers() const { return buffers_; }\n \tint setBuffers(const std::map<Stream *, Buffer *> &streamMap);\n \tBuffer *findBuffer(Stream *stream) const;\n \n@@ -50,7 +50,7 @@ private:\n \tbool completeBuffer(Buffer *buffer);\n \n \tCamera *camera_;\n-\tstd::map<Stream *, Buffer *> bufferMap_;\n+\tstd::map<Stream *, Buffer *> buffers_;\n \tstd::unordered_set<Buffer *> pending_;\n \n \tStatus status_;\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex a71b44b82ea0..4b66d6216950 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -883,7 +883,7 @@ int Camera::stop()\n */\n void Camera::requestComplete(Request *request)\n {\n-\tstd::map<Stream *, Buffer *> buffers(std::move(request->bufferMap_));\n+\tstd::map<Stream *, Buffer *> 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 fa3ee46da440..def7f2f21dc7 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -70,20 +70,20 @@ Request::Request(Camera *camera)\n */\n int Request::setBuffers(const std::map<Stream *, Buffer *> &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@@ -96,8 +96,8 @@ int Request::setBuffers(const std::map<Stream *, Buffer *> &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@@ -134,12 +134,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", "RFC", "5/8" ] }