From patchwork Mon Oct 28 02:25:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 2266 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1E5A46150A for ; Mon, 28 Oct 2019 03:25:53 +0100 (CET) X-Halon-ID: 412752f6-f92a-11e9-903a-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from localhost.localdomain (unknown [93.2.121.143]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 412752f6-f92a-11e9-903a-005056917f90; Mon, 28 Oct 2019 03:25:49 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 28 Oct 2019 03:25:18 +0100 Message-Id: <20191028022525.796995-6-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028022525.796995-1-niklas.soderlund@ragnatech.se> References: <20191028022525.796995-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC 05/12] libcamera: buffer: Remove request tracking X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2019 02:25:53 -0000 It's no longer needed to track which request the application provided buffer belongs to, drop the helpers for this. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- include/libcamera/buffer.h | 4 ---- src/libcamera/buffer.cpp | 3 +-- src/libcamera/request.cpp | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h index c349b995e1eb35ee..54c757ef7db8b5f6 100644 --- a/include/libcamera/buffer.h +++ b/include/libcamera/buffer.h @@ -83,7 +83,6 @@ public: unsigned int sequence() const { return sequence_; } Status status() const { return status_; } - Request *request() const { return request_; } Stream *stream() const { return stream_; } private: @@ -94,8 +93,6 @@ private: void cancel(); - void setRequest(Request *request) { request_ = request; } - unsigned int index_; std::array dmabuf_; BufferMemory *mem_; @@ -105,7 +102,6 @@ private: unsigned int sequence_; Status status_; - Request *request_; Stream *stream_; }; diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp index 4407201bd81c368d..10b16a862393b536 100644 --- a/src/libcamera/buffer.cpp +++ b/src/libcamera/buffer.cpp @@ -270,8 +270,7 @@ void BufferPool::destroyBuffers() */ Buffer::Buffer(unsigned int index, const Buffer *metadata) : index_(index), dmabuf_({ -1, -1, -1 }), - status_(Buffer::BufferSuccess), request_(nullptr), - stream_(nullptr) + status_(Buffer::BufferSuccess), stream_(nullptr) { if (metadata) { bytesused_ = metadata->bytesused_; diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index c14ed1a4d3ce55d0..a9468ed4b0512a7f 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -220,7 +220,6 @@ int Request::prepare() for (auto const &pair : bufferMap_) { Buffer *buffer = pair.second; - buffer->setRequest(this); pending_.insert(buffer); } @@ -258,8 +257,6 @@ bool Request::completeBuffer(Buffer *buffer) int ret = pending_.erase(buffer); ASSERT(ret == 1); - buffer->setRequest(nullptr); - if (buffer->status() == Buffer::BufferCancelled) cancelled_ = true;