Patch Detail
Show a patch.
GET /api/1.1/patches/21042/?format=api
{ "id": 21042, "url": "https://patchwork.libcamera.org/api/1.1/patches/21042/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21042/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240827153349.2893413-1-chenghaoyang@google.com>", "date": "2024-08-27T15:33:38", "name": "[v9.1,1/8] libcamera: add DmaBufAllocator::exportBuffers()", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "3bf0e3cf00b93613b40c2e8fe91dc023a635bcbc", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21042/mbox/", "series": [ { "id": 4545, "url": "https://patchwork.libcamera.org/api/1.1/series/4545/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4545", "date": "2024-08-27T15:33:38", "name": "[v9.1,1/8] libcamera: add DmaBufAllocator::exportBuffers()", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4545/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21042/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21042/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 2B5FDC323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 27 Aug 2024 15:33:58 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C25C563460;\n\tTue, 27 Aug 2024 17:33:56 +0200 (CEST)", "from mail-wr1-x435.google.com (mail-wr1-x435.google.com\n\t[IPv6:2a00:1450:4864:20::435])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 146EF61901\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 27 Aug 2024 17:33:55 +0200 (CEST)", "by mail-wr1-x435.google.com with SMTP id\n\tffacd0b85a97d-37182eee02dso3090783f8f.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 27 Aug 2024 08:33:55 -0700 (PDT)", "from chenghaoyang-germany.c.googlers.com.com\n\t(161.126.77.34.bc.googleusercontent.com. [34.77.126.161])\n\tby smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-42ac517a442sm191386935e9.36.2024.08.27.08.33.53\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 27 Aug 2024 08:33:53 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"bfWpFyg0\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1724772834; x=1725377634;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:message-id:date:subject:cc\n\t:to:from:from:to:cc:subject:date:message-id:reply-to;\n\tbh=rQ840Cif1XVGygX4o0Y4c7lfT+PQRq2ZCLmHDu/j4Ss=;\n\tb=bfWpFyg0+M0pAA3mBx88M6Vi3iKyYngY3HTlsGguX3dTO3eVp8SFhDCqrlhXkLoSYh\n\tO3eZFrXz+yoZL29RiJlO1MKr7yoKy4BBk4XHVfuTIewftJNdv0cWmpGBcwGwuMjv9ebO\n\tY0wiqSM2hVxk2pTaPzwjtgWo205WfmyUSSuH8=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1724772834; x=1725377634;\n\th=content-transfer-encoding:mime-version:message-id:date:subject:cc\n\t:to:from:x-gm-message-state:from:to:cc:subject:date:message-id\n\t:reply-to;\n\tbh=rQ840Cif1XVGygX4o0Y4c7lfT+PQRq2ZCLmHDu/j4Ss=;\n\tb=NSsBj8NZ4D8CELArvbsVZIszLi6xWIDHxQoTLCjbHr2lLzM7/7Tq/B52q7Afkdzwpv\n\tnGCyG/CoXtMcWVIJUauX6hBBr2fc69MAOHeZq88Q2g/T9L8DCHuW6YH3O0o3Kz2GFFus\n\t6ss7Hb3smkMDvnFcai5hUxmKtMVa/Giej4NihLvR2yns+UeKt60A5x+BQBNxEVYEEFLw\n\tYIR3GPXLdMX18m02aKC/ccSD6UL5avZYnGR5eu9ct5UqnrpK2nVA8NZJx/ZiSqsJRDpG\n\tvLDXUDq8gMyUZka1cULkR27QPl/QUWENgX61dFsgeOoRZIQwoQdqWUjqGNw8eusYzOi6\n\tdM6g==", "X-Gm-Message-State": "AOJu0YwTV9pakWtdux3xse29mi8SEWLgTa+hO6O9lgWGLQvb5PvY1dwJ\n\tcdgM4wj4NehjLaG/M56ye/VrcRwDRSXkEmGGPyeKjtFG4EzLlhMlHNR7+9JkeEjKo1WiizkUIW8\n\t//bSt", "X-Google-Smtp-Source": "AGHT+IGzA6f/m0qzIX5e8DciipV/3PNrIvybR6NYvkiqUeio+IvuDL6XOHnipMoJH+Ew7KQvi5Ns8Q==", "X-Received": "by 2002:adf:fc0d:0:b0:365:aec0:e191 with SMTP id\n\tffacd0b85a97d-3748c88a349mr2162875f8f.21.1724772834110; \n\tTue, 27 Aug 2024 08:33:54 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Harvey Yang <chenghaoyang@google.com>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH v9.1 1/8] libcamera: add DmaBufAllocator::exportBuffers()", "Date": "Tue, 27 Aug 2024 15:33:38 +0000", "Message-ID": "<20240827153349.2893413-1-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.46.0.295.g3b9ea8a38a-goog", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a helper function exportBuffers in DmaBufAllocator to make it easier\nto use.\n\nIt'll be used in Virtual Pipeline Handler and SoftwareIsp.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n .../libcamera/internal/dma_buf_allocator.h | 12 ++++\n src/libcamera/dma_buf_allocator.cpp | 55 +++++++++++++++++++\n 2 files changed, 67 insertions(+)", "diff": "diff --git a/include/libcamera/internal/dma_buf_allocator.h b/include/libcamera/internal/dma_buf_allocator.h\nindex 36ec1696b..49122ed95 100644\n--- a/include/libcamera/internal/dma_buf_allocator.h\n+++ b/include/libcamera/internal/dma_buf_allocator.h\n@@ -7,13 +7,18 @@\n \n #pragma once\n \n+#include <memory>\n #include <stddef.h>\n+#include <string>\n+#include <vector>\n \n #include <libcamera/base/flags.h>\n #include <libcamera/base/unique_fd.h>\n \n namespace libcamera {\n \n+class FrameBuffer;\n+\n class DmaBufAllocator\n {\n public:\n@@ -30,7 +35,14 @@ public:\n \tbool isValid() const { return providerHandle_.isValid(); }\n \tUniqueFD alloc(const char *name, std::size_t size);\n \n+\tint exportBuffers(unsigned int count,\n+\t\t\t const std::vector<unsigned int> &frameSize,\n+\t\t\t std::vector<std::unique_ptr<FrameBuffer>> *buffers);\n+\n private:\n+\tstd::unique_ptr<FrameBuffer> createBuffer(\n+\t\tstd::string name, const std::vector<unsigned int> &frameSizes);\n+\n \tUniqueFD allocFromHeap(const char *name, std::size_t size);\n \tUniqueFD allocFromUDmaBuf(const char *name, std::size_t size);\n \tUniqueFD providerHandle_;\ndiff --git a/src/libcamera/dma_buf_allocator.cpp b/src/libcamera/dma_buf_allocator.cpp\nindex be6efb89f..d2ac175f0 100644\n--- a/src/libcamera/dma_buf_allocator.cpp\n+++ b/src/libcamera/dma_buf_allocator.cpp\n@@ -23,6 +23,10 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/memfd.h>\n \n+#include <libcamera/framebuffer.h>\n+\n+#include \"libcamera/internal/formats.h\"\n+\n /**\n * \\file dma_buf_allocator.cpp\n * \\brief dma-buf allocator\n@@ -205,4 +209,55 @@ UniqueFD DmaBufAllocator::alloc(const char *name, std::size_t size)\n \t\treturn allocFromHeap(name, size);\n }\n \n+/**\n+ * \\brief Allocate and export buffers from the DmaBufAllocator\n+ * \\param[in] count The number of requested FrameBuffers\n+ * \\param[in] frameSizes The sizes of planes in each FrameBuffer\n+ * \\param[out] buffers Array of buffers successfully allocated\n+ *\n+ * \\return The number of allocated buffers on success or a negative error code\n+ * otherwise\n+ */\n+int DmaBufAllocator::exportBuffers(unsigned int count,\n+\t\t\t\t const std::vector<unsigned int> &frameSizes,\n+\t\t\t\t std::vector<std::unique_ptr<FrameBuffer>> *buffers)\n+{\n+\tfor (unsigned int i = 0; i < count; ++i) {\n+\t\tstd::unique_ptr<FrameBuffer> buffer =\n+\t\t\tcreateBuffer(\"frame-\" + std::to_string(i), frameSizes);\n+\t\tif (!buffer) {\n+\t\t\tLOG(DmaBufAllocator, Error) << \"Unable to create buffer\";\n+\n+\t\t\tbuffers->clear();\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tbuffers->push_back(std::move(buffer));\n+\t}\n+\n+\treturn count;\n+}\n+\n+std::unique_ptr<FrameBuffer>\n+DmaBufAllocator::createBuffer(std::string name,\n+\t\t\t const std::vector<unsigned int> &frameSizes)\n+{\n+\tstd::vector<FrameBuffer::Plane> planes;\n+\n+\tunsigned int bufferSize = 0, offset = 0;\n+\tfor (auto frameSize : frameSizes)\n+\t\tbufferSize += frameSize;\n+\n+\tSharedFD fd(alloc(name.c_str(), bufferSize));\n+\tif (!fd.isValid())\n+\t\treturn nullptr;\n+\n+\tfor (auto frameSize : frameSizes) {\n+\t\tplanes.emplace_back(FrameBuffer::Plane{ fd, offset, frameSize });\n+\t\toffset += frameSize;\n+\t}\n+\n+\treturn std::make_unique<FrameBuffer>(planes);\n+}\n+\n } /* namespace libcamera */\n", "prefixes": [ "v9.1", "1/8" ] }