{"id":14672,"url":"https://patchwork.libcamera.org/api/patches/14672/?format=json","web_url":"https://patchwork.libcamera.org/patch/14672/","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":"<20211120111313.106621-5-jacopo@jmondi.org>","date":"2021-11-20T11:13:05","name":"[libcamera-devel,v2,04/12] libcamera: request: Add Fence to Request::addBuffer()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1248923854d4aa9b6a0e0cc6cce428103e68c293","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14672/mbox/","series":[{"id":2739,"url":"https://patchwork.libcamera.org/api/series/2739/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2739","date":"2021-11-20T11:13:01","name":"libcamera: Add support for Fence","version":2,"mbox":"https://patchwork.libcamera.org/series/2739/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14672/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14672/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 404AEC324F\n\tfor ;\n\tSat, 20 Nov 2021 11:12:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C530A6048E;\n\tSat, 20 Nov 2021 12:12:28 +0100 (CET)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 12F1D6033C\n\tfor ;\n\tSat, 20 Nov 2021 12:12:25 +0100 (CET)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 99372100002;\n\tSat, 20 Nov 2021 11:12:24 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 20 Nov 2021 12:13:05 +0100","Message-Id":"<20211120111313.106621-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.33.1","In-Reply-To":"<20211120111313.106621-1-jacopo@jmondi.org>","References":"<20211120111313.106621-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 04/12] libcamera: request: Add Fence to\n\tRequest::addBuffer()","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add an overloaded version of Request::addBuffer() that allows\napplication to specify a Fence instance to be associated with the\nFramebuffer.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/request.h | 5 ++++\n src/libcamera/request.cpp | 58 ++++++++++++++++++++++++++++---------\n 2 files changed, 50 insertions(+), 13 deletions(-)","diff":"diff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex f0c5163d987e..37aebc41834e 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -22,6 +22,7 @@ namespace libcamera {\n \n class Camera;\n class CameraControlValidator;\n+class Fence;\n class FrameBuffer;\n class Stream;\n \n@@ -52,6 +53,8 @@ public:\n \tControlList &metadata() { return *metadata_; }\n \tconst BufferMap &buffers() const { return bufferMap_; }\n \tint addBuffer(const Stream *stream, FrameBuffer *buffer);\n+\tint addBuffer(const Stream *stream, FrameBuffer *buffer,\n+\t\t std::unique_ptr &&fence);\n \tFrameBuffer *findBuffer(const Stream *stream) const;\n \n \tuint32_t sequence() const;\n@@ -65,6 +68,8 @@ public:\n private:\n \tLIBCAMERA_DISABLE_COPY(Request)\n \n+\tint _addBuffer(const Stream *stream, FrameBuffer *buffer);\n+\n \tControlList *controls_;\n \tControlList *metadata_;\n \tBufferMap bufferMap_;\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 90c436648405..1d47698a6263 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -19,6 +19,7 @@\n \n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/camera_controls.h\"\n+#include \"libcamera/internal/fence.h\"\n #include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/tracepoints.h\"\n \n@@ -316,6 +317,26 @@ void Request::reuse(ReuseFlag flags)\n * \\return The map of Stream to FrameBuffer\n */\n \n+int Request::_addBuffer(const Stream *stream, FrameBuffer *buffer)\n+{\n+\tif (!stream) {\n+\t\tLOG(Request, Error) << \"Invalid stream reference\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tauto it = bufferMap_.find(stream);\n+\tif (it != bufferMap_.end()) {\n+\t\tLOG(Request, Error) << \"FrameBuffer already set for stream\";\n+\t\treturn -EEXIST;\n+\t}\n+\n+\tbuffer->_d()->setRequest(this);\n+\t_d()->pending_.insert(buffer);\n+\tbufferMap_[stream] = buffer;\n+\n+\treturn 0;\n+}\n+\n /**\n * \\brief Add a FrameBuffer with its associated Stream to the Request\n * \\param[in] stream The stream the buffer belongs to\n@@ -334,22 +355,33 @@ void Request::reuse(ReuseFlag flags)\n */\n int Request::addBuffer(const Stream *stream, FrameBuffer *buffer)\n {\n-\tif (!stream) {\n-\t\tLOG(Request, Error) << \"Invalid stream reference\";\n-\t\treturn -EINVAL;\n-\t}\n+\tint ret = _addBuffer(stream, buffer);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/*\n+\t * Drop the buffer Fence, if any.\n+\t *\n+\t * Buffers can be re-used and might still have a Fence associated from\n+\t * a previous run if the Fence has failed. Drop it here.\n+\t */\n+\tbuffer->_d()->closeFence();\n \n-\tauto it = bufferMap_.find(stream);\n-\tif (it != bufferMap_.end()) {\n-\t\tLOG(Request, Error) << \"FrameBuffer already set for stream\";\n-\t\treturn -EEXIST;\n-\t}\n+\treturn 0;\n+}\n \n-\tbuffer->_d()->setRequest(this);\n-\t_d()->pending_.insert(buffer);\n-\tbufferMap_[stream] = buffer;\n+/**\n+ * \\brief Add a FrameBuffer with its associated Stream and Fence\n+ * \\copydoc Request::addBuffer(const Stream *stream, FrameBuffer *buffer)\n+ * \\param[in] fence The synchronization fence associated with \\a buffer\n+ */\n+int Request::addBuffer(const Stream *stream, FrameBuffer *buffer,\n+\t\t std::unique_ptr &&fence)\n+{\n+\tif (fence->isValid())\n+\t\tbuffer->_d()->setFence(std::move(fence));\n \n-\treturn 0;\n+\treturn _addBuffer(stream, buffer);\n }\n \n /**\n","prefixes":["libcamera-devel","v2","04/12"]}