{"id":2456,"url":"https://patchwork.libcamera.org/api/patches/2456/?format=json","web_url":"https://patchwork.libcamera.org/patch/2456/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20191230120510.938333-7-niklas.soderlund@ragnatech.se>","date":"2019-12-30T12:04:51","name":"[libcamera-devel,v2,06/25] libcamera: buffer: Drop private function setRequest()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"9c72dda1edf3e36e2880a88aa51e152b45c54283","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2456/mbox/","series":[{"id":593,"url":"https://patchwork.libcamera.org/api/series/593/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=593","date":"2019-12-30T12:04:45","name":"libcamera: Rework buffer API","version":2,"mbox":"https://patchwork.libcamera.org/series/593/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2456/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2456/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 65810605E8\n\tfor ;\n\tMon, 30 Dec 2019 13:05:54 +0100 (CET)","from bismarck.berto.se (p4fca2fd0.dip0.t-ipconnect.de\n\t[79.202.47.208]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid ba3349c3-2afc-11ea-a00b-005056917a89;\n\tMon, 30 Dec 2019 13:05:53 +0100 (CET)"],"X-Halon-ID":"ba3349c3-2afc-11ea-a00b-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 30 Dec 2019 13:04:51 +0100","Message-Id":"<20191230120510.938333-7-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20191230120510.938333-1-niklas.soderlund@ragnatech.se>","References":"<20191230120510.938333-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 06/25] libcamera: buffer: Drop private\n\tfunction setRequest()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 30 Dec 2019 12:05:55 -0000"},"content":"There is no need to have a private helper function to access a private\ndata member when a friend statement is needed anyhow. Remove the helper\nfunction to simplify the code and make it clear that a private member of\nBuffer is accessed.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/buffer.h | 2 --\n src/libcamera/buffer.cpp | 8 ++++----\n src/libcamera/request.cpp | 4 ++--\n 3 files changed, 6 insertions(+), 8 deletions(-)","diff":"diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h\nindex 2d8885e9f3a1234f..8dd9f91272291648 100644\n--- a/include/libcamera/buffer.h\n+++ b/include/libcamera/buffer.h\n@@ -123,8 +123,6 @@ private:\n \n \tvoid cancel();\n \n-\tvoid setRequest(Request *request) { request_ = request; }\n-\n \tunsigned int index_;\n \tstd::array dmabuf_;\n \tBufferMemory *mem_;\ndiff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp\nindex 3ea982306843b116..4a77f20751408b7c 100644\n--- a/src/libcamera/buffer.cpp\n+++ b/src/libcamera/buffer.cpp\n@@ -279,7 +279,6 @@ Buffer::Buffer(unsigned int index, const Buffer *metadata)\n *\n * \\return The Request the Buffer belongs to, or nullptr if the buffer is\n * either completed or not associated with a request\n- * \\sa Buffer::setRequest()\n */\n \n /**\n@@ -307,10 +306,11 @@ void Buffer::cancel()\n }\n \n /**\n- * \\fn Buffer::setRequest()\n- * \\brief Set the request this buffer belongs to\n+ * \\var Buffer::request_\n+ * \\brief The request this buffer belongs to\n *\n- * The intended callers are Request::prepare() and Request::completeBuffer().\n+ * This member is intended to be set by Request::prepare() and\n+ * Request::completeBuffer().\n */\n \n /**\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex c14ed1a4d3ce55d0..c2854dc2e8caab2e 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -220,7 +220,7 @@ int Request::prepare()\n \n \tfor (auto const &pair : bufferMap_) {\n \t\tBuffer *buffer = pair.second;\n-\t\tbuffer->setRequest(this);\n+\t\tbuffer->request_ = this;\n \t\tpending_.insert(buffer);\n \t}\n \n@@ -258,7 +258,7 @@ bool Request::completeBuffer(Buffer *buffer)\n \tint ret = pending_.erase(buffer);\n \tASSERT(ret == 1);\n \n-\tbuffer->setRequest(nullptr);\n+\tbuffer->request_ = nullptr;\n \n \tif (buffer->status() == Buffer::BufferCancelled)\n \t\tcancelled_ = true;\n","prefixes":["libcamera-devel","v2","06/25"]}