Patch Detail
Show a patch.
GET /api/patches/21049/?format=api
{ "id": 21049, "url": "https://patchwork.libcamera.org/api/patches/21049/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21049/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20240829195703.1456614-2-chenghaoyang@chromium.org>", "date": "2024-08-29T19:47:40", "name": "[v10,1/7] 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/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21049/mbox/", "series": [ { "id": 4547, "url": "https://patchwork.libcamera.org/api/series/4547/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4547", "date": "2024-08-29T19:47:39", "name": "Add VirtualPipelineHandler", "version": 10, "mbox": "https://patchwork.libcamera.org/series/4547/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21049/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21049/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 66B51C323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 29 Aug 2024 19:57:15 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A1815634A6;\n\tThu, 29 Aug 2024 21:57:11 +0200 (CEST)", "from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com\n\t[IPv6:2a00:1450:4864:20::32b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DA7DD63458\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 29 Aug 2024 21:57:07 +0200 (CEST)", "by mail-wm1-x32b.google.com with SMTP id\n\t5b1f17b1804b1-428e0d184b4so8872615e9.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 29 Aug 2024 12:57:07 -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-42ba7b4271fsm54602805e9.29.2024.08.29.12.57.06\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 29 Aug 2024 12:57:06 -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=\"OJ9Bvj3n\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1724961427; x=1725566227;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=ELIT8Vdp9VvtK30ZWCYSufAPpOhd7DlPXyMWDCSWtCM=;\n\tb=OJ9Bvj3nx1/rXaoliq+pScgrQJh5TRUL6xgWwcgD54gbX7/RhOltGYUPBTAzZ3vlEu\n\tp9WzAedaYhkmm6SUvHrduBy6Gf726aWb/guZc8G9YfomzOueoExfTDGvyEphbCunwxYo\n\tNHrXjvwoIX3FaJ/a+YYQpvhjpGnZFTQBnMRDQ=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1724961427; x=1725566227;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=ELIT8Vdp9VvtK30ZWCYSufAPpOhd7DlPXyMWDCSWtCM=;\n\tb=iJutcvOw+8qAE7h0izeteGOgy5tT/vc/yp+JuPISkJlhjE9Sxpjp3o8gUyXVd0vj8j\n\tHOMTAo2Js+5tklc1x6otw2wVgojfmuKPrOT3Vg76pXjWTtHInIvwjTL1qCMsTpQRyauq\n\t+alz7i279gpbklHV4/b3LjelUnm/SYJbANRKr3X/Hd1VuZQp4pzTa66PjfadUTi8vBcH\n\tNOXdXE+meIk/jpGsyRjAVl80eJPlJB9i36x2IkBB2Zm1yPnBDWXTmEWLSgaKMICmlUxF\n\tqTrhqg0rZ5+d36to/DqfHe0SJydzA+XIL9D443unmRpSf0NcXdqX8oXpTHH68CMGzBLV\n\tJphw==", "X-Gm-Message-State": "AOJu0YxGVszGM1F5wlr+BiUZ3pyMrxfEbi3ZQ82RATdwsyDYuYRxQg5n\n\tU8C6HTBgG/9zPA3mU/v6iw+d7PhvlgsFPDIfVGq7MdyMlTAY/qkYvE2008m8zIEy9rAeSIH3MeM\n\toIw==", "X-Google-Smtp-Source": "AGHT+IEBQa9Gv3TwceuE+Gsm8JoUNIrLMatcIEzg31y8yIyoy1tTunT5GdhWbJBe4uQrPto/z7F38A==", "X-Received": "by 2002:adf:f242:0:b0:360:791c:aff2 with SMTP id\n\tffacd0b85a97d-3749b58e3bdmr2530741f8f.47.1724961426882; \n\tThu, 29 Aug 2024 12:57:06 -0700 (PDT)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Harvey Yang <chenghaoyang@google.com>,\n\tHarvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH v10 1/7] libcamera: add DmaBufAllocator::exportBuffers()", "Date": "Thu, 29 Aug 2024 19:47:40 +0000", "Message-ID": "<20240829195703.1456614-2-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.46.0.469.g59c65b2a67-goog", "In-Reply-To": "<20240829195703.1456614-1-chenghaoyang@chromium.org>", "References": "<20240829195703.1456614-1-chenghaoyang@chromium.org>", "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": "From: Harvey Yang <chenghaoyang@google.com>\n\nAdd 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": [ "v10", "1/7" ] }