From patchwork Thu Jul 4 22:53:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 1626 Return-Path: Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D511F60C2C for ; Fri, 5 Jul 2019 00:52:30 +0200 (CEST) X-Originating-IP: 2.224.242.101 Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 6174C1C0002; Thu, 4 Jul 2019 22:52:29 +0000 (UTC) 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 Subject: [libcamera-devel] [PATCH 5/9] libcamera: request: Rename the Stream to Buffer map X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jul 2019 22:52:31 -0000 As we're about to add support for mapping application buffers to streams' ones, rename the existing bufferMap_ to just buffers_, which also matches the associated accessor operation name. Signed-off-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- include/libcamera/request.h | 4 ++-- src/libcamera/camera.cpp | 2 +- src/libcamera/request.cpp | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/libcamera/request.h b/include/libcamera/request.h index a93468d7c8b7..70f6d7fa7eeb 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -34,7 +34,7 @@ public: Request &operator=(const Request &) = delete; ControlList &controls() { return controls_; } - const std::map &buffers() const { return bufferMap_; } + const std::map &buffers() const { return buffers_; } int setBuffers(const std::map &streamMap); Buffer *findBuffer(Stream *stream) const; @@ -53,7 +53,7 @@ private: Camera *camera_; ControlList controls_; - std::map bufferMap_; + std::map buffers_; std::unordered_set pending_; Status status_; diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index f3f01d040ecf..265755f1b9e3 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -895,7 +895,7 @@ int Camera::stop() */ void Camera::requestComplete(Request *request) { - std::map buffers(std::move(request->bufferMap_)); + std::map buffers(std::move(request->buffers_)); requestCompleted.emit(request, buffers); delete request; } diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index f0b5985814bd..9ff0abbf119c 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -86,20 +86,20 @@ Request::Request(Camera *camera) */ int Request::setBuffers(const std::map &streamMap) { - if (!bufferMap_.empty()) { + if (!buffers_.empty()) { LOG(Request, Error) << "Buffers already set"; return -EBUSY; } - bufferMap_ = streamMap; + buffers_ = streamMap; return 0; } /** - * \var Request::bufferMap_ + * \var Request::buffers_ * \brief Mapping of streams to buffers for this request * - * The bufferMap_ tracks the buffers associated with each stream. If a stream is + * The buffers_ tracks the buffers associated with each stream. If a stream is * not utilised in this request there will be no buffer for that stream in the * map. */ @@ -112,8 +112,8 @@ int Request::setBuffers(const std::map &streamMap) */ Buffer *Request::findBuffer(Stream *stream) const { - auto it = bufferMap_.find(stream); - if (it == bufferMap_.end()) + auto it = buffers_.find(stream); + if (it == buffers_.end()) return nullptr; return it->second; @@ -150,12 +150,12 @@ Buffer *Request::findBuffer(Stream *stream) const */ int Request::prepare() { - if (bufferMap_.empty()) { + if (buffers_.empty()) { LOG(Request, Error) << "Invalid request due to missing buffers"; return -EINVAL; } - for (auto const &pair : bufferMap_) { + for (auto const &pair : buffers_) { Buffer *buffer = pair.second; buffer->setRequest(this); pending_.insert(buffer);