{"id":3348,"url":"https://patchwork.libcamera.org/api/patches/3348/?format=json","web_url":"https://patchwork.libcamera.org/patch/3348/","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":"<20200326225844.4117712-5-niklas.soderlund@ragnatech.se>","date":"2020-03-26T22:58:41","name":"[libcamera-devel,v2,4/7] libcamera: FrameBuffer: Add a method to copy buffer content","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"15ea467414e2ccf17549669de1063d44feecf210","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/3348/mbox/","series":[{"id":785,"url":"https://patchwork.libcamera.org/api/series/785/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=785","date":"2020-03-26T22:58:37","name":"libcamera: Add support for a RAW still capture","version":2,"mbox":"https://patchwork.libcamera.org/series/785/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3348/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3348/checks/","tags":{},"headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","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 08BC062D13\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 26 Mar 2020 23:58:59 +0100 (CET)","from bismarck.berto.se (p4fca2392.dip0.t-ipconnect.de\n\t[79.202.35.146]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 5f67028a-6fb5-11ea-aeed-005056917f90;\n\tThu, 26 Mar 2020 23:58:57 +0100 (CET)"],"X-Halon-ID":"5f67028a-6fb5-11ea-aeed-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 26 Mar 2020 23:58:41 +0100","Message-Id":"<20200326225844.4117712-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200326225844.4117712-1-niklas.soderlund@ragnatech.se>","References":"<20200326225844.4117712-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 4/7] libcamera: FrameBuffer: Add a\n\tmethod to copy buffer content","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","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":"Thu, 26 Mar 2020 22:59:01 -0000"},"content":"This method may be used to memory copy a whole FrameBuffer content\nfrom another buffer. The operation is not fast and should not be used\nwithout great care by pipelines.\n\nThe intended use-case is to have an option to copy out RAW buffers from\nthe middle of a pipeline.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n* Changes since v1\n- Update documentation\n- s/NULL/nullptr/\n\n* Changes since RFC\n- Make method member of FrameBuffer\n- Add documentation\n- s/out/dstmem/ and s/in/src/mem/\n---\n include/libcamera/buffer.h |  1 +\n src/libcamera/buffer.cpp   | 68 ++++++++++++++++++++++++++++++++++++++\n 2 files changed, 69 insertions(+)","diff":"diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h\nindex 8e5ec699e3925eee..ef3a3b36cd4e4e17 100644\n--- a/include/libcamera/buffer.h\n+++ b/include/libcamera/buffer.h\n@@ -57,6 +57,7 @@ public:\n \tunsigned int cookie() const { return cookie_; }\n \tvoid setCookie(unsigned int cookie) { cookie_ = cookie; }\n \n+\tint copyFrom(const FrameBuffer *src);\n private:\n \tfriend class Request; /* Needed to update request_. */\n \tfriend class V4L2VideoDevice; /* Needed to update metadata_. */\ndiff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp\nindex 673a63d3d1658190..93057568fc56a6f5 100644\n--- a/src/libcamera/buffer.cpp\n+++ b/src/libcamera/buffer.cpp\n@@ -211,4 +211,72 @@ FrameBuffer::FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie)\n  * core never modifies the buffer cookie.\n  */\n \n+/**\n+ * \\brief Copy the contents from another buffer\n+ * \\param[in] src Buffer to copy\n+ *\n+ * Copy the buffer contents and metadata from \\a src to this buffer. The\n+ * destination FrameBuffer shall have the same number of planes as the source\n+ * buffer, and each destination plane shall be larger than or equal to the\n+ * corresponding source plane.\n+ *\n+ * The complete metadata of the source buffer is copied to the destination\n+ * buffer. If an error occurs during the copy, the destination buffer's metadata\n+ * status is set to FrameMetadata::FrameError, and other metadata fields are not\n+ * modified.\n+ *\n+ * The operation is performed using memcpy() so is very slow, users needs to\n+ * consider this before copying buffers.\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ */\n+int FrameBuffer::copyFrom(const FrameBuffer *src)\n+{\n+\tif (planes_.size() != src->planes_.size()) {\n+\t\tLOG(Buffer, Error) << \"Different number of planes\";\n+\t\tmetadata_.status = FrameMetadata::FrameError;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfor (unsigned int i = 0; i < planes_.size(); i++) {\n+\t\tif (planes_[i].length < src->planes_[i].length) {\n+\t\t\tLOG(Buffer, Error) << \"Plane \" << i << \" is too small\";\n+\t\t\tmetadata_.status = FrameMetadata::FrameError;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\tfor (unsigned int i = 0; i < planes_.size(); i++) {\n+\t\tvoid *dstmem = mmap(nullptr, planes_[i].length, PROT_WRITE,\n+\t\t\t\t    MAP_SHARED, planes_[i].fd.fd(), 0);\n+\n+\t\tif (dstmem == MAP_FAILED) {\n+\t\t\tLOG(Buffer, Error)\n+\t\t\t\t<< \"Failed to map destination plane \" << i;\n+\t\t\tmetadata_.status = FrameMetadata::FrameError;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tvoid *srcmem = mmap(nullptr, src->planes_[i].length, PROT_READ,\n+\t\t\t\t    MAP_SHARED, src->planes_[i].fd.fd(), 0);\n+\n+\t\tif (srcmem == MAP_FAILED) {\n+\t\t\tmunmap(dstmem, planes_[i].length);\n+\t\t\tLOG(Buffer, Error)\n+\t\t\t\t<< \"Failed to map source plane \" << i;\n+\t\t\tmetadata_.status = FrameMetadata::FrameError;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tmemcpy(dstmem, srcmem, src->planes_[i].length);\n+\n+\t\tmunmap(srcmem, src->planes_[i].length);\n+\t\tmunmap(dstmem, planes_[i].length);\n+\t}\n+\n+\tmetadata_ = src->metadata_;\n+\n+\treturn 0;\n+}\n+\n } /* namespace libcamera */\n","prefixes":["libcamera-devel","v2","4/7"]}