{"id":21503,"url":"https://patchwork.libcamera.org/api/patches/21503/?format=json","web_url":"https://patchwork.libcamera.org/patch/21503/","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":"<20241004095946.264537-2-chenghaoyang@google.com>","date":"2024-10-04T09:59:14","name":"[15,1/7] libcamera: add DmaBufAllocator::exportBuffers()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ed60f2d0706996035f0d068f760645e99d473c70","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21503/mbox/","series":[{"id":4656,"url":"https://patchwork.libcamera.org/api/series/4656/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4656","date":"2024-10-04T09:59:14","name":"[15,1/7] libcamera: add DmaBufAllocator::exportBuffers()","version":1,"mbox":"https://patchwork.libcamera.org/series/4656/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21503/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21503/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 86C40C3257\n\tfor ;\n\tFri, 4 Oct 2024 09:59:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4255D63531;\n\tFri, 4 Oct 2024 11:59:58 +0200 (CEST)","from mail-ot1-x333.google.com (mail-ot1-x333.google.com\n\t[IPv6:2607:f8b0:4864:20::333])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3D6466352B\n\tfor ;\n\tFri, 4 Oct 2024 11:59:54 +0200 (CEST)","by mail-ot1-x333.google.com with SMTP id\n\t46e09a7af769-7124395ca86so859025a34.0\n\tfor ;\n\tFri, 04 Oct 2024 02:59:54 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(27.247.221.35.bc.googleusercontent.com. [35.221.247.27])\n\tby smtp.gmail.com with ESMTPSA id\n\td2e1a72fcca58-71ded2ad931sm316911b3a.41.2024.10.04.02.59.51\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 04 Oct 2024 02:59:52 -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=\"RvXS40aD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1728035993; x=1728640793;\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=llkXwXEbrhhVjPAPlCwKt6WULyQC7Ghp18EkJKUOl4E=;\n\tb=RvXS40aDpcMWq9tzdVsBn45WjJjoz3DDXIVKgEbkaJP2VUrFWDsZAEhgmnZBiSdx/t\n\tAUHEs39ZqPmb1jmWwRgp7Vb5VisPkJEHUJS+n6EcoXhCmaaKgu4Ibm7ZdyJcSJiTQ2Xc\n\tTm9Tw50BcOkIcboD9nz7Q0XbQd6BBnnKivDhs=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1728035993; x=1728640793;\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=llkXwXEbrhhVjPAPlCwKt6WULyQC7Ghp18EkJKUOl4E=;\n\tb=kSskorlwl6lNe9k4d4BIHNFlhWGBUA6owmL74scFBgRpl7JFU3jp4INR1cQjITcCzk\n\tZ8aLPCkbVDFCRjprKmMjlZjZxfZbShhAz+VTaNtLdeHQVExlVlnRKdM8hASKxrmjVAin\n\tb7e9vW0Wi30618XruErM+j8QLZ00YsG3gyKJ7F2Qhps5R8aT2TKDP8SGMt6CgMIGd2ca\n\togixZzR9Rb1XLTZ0spiKwYFKBMaFSaZox4VZsRZf5pMFOLLcsd7yxrjPCX+OaIJmx9ON\n\t4wJtJGEw/MMl26ipd9eImc30pKl8fcYdXCuQ1PMVcczWbO1JBXpiefNs9RDGXmxOQB1k\n\tVZwA==","X-Gm-Message-State":"AOJu0YzfHXFxdysYm5gG1gcDQmL4p5yREdQmiZNtDUPme8AHWQVOAiUu\n\tMLx5TSOGf7L7wWAYXAGE1Bz8Rz6kDOP/MrCe9yrN3ibr3Ljeqc5oWbs40TBuUWFS5ojoxScOHYM\n\t=","X-Google-Smtp-Source":"AGHT+IFkbKL6kbVX3lRTibASKtGE5BLBYAa6qvB3WwAPvANnE9m7QikXA51G1K/+kg1SQ0awvIhXtA==","X-Received":"by 2002:a05:6830:4983:b0:713:d15b:6cb7 with SMTP id\n\t46e09a7af769-7154e81a831mr2286204a34.4.1728035992690; \n\tFri, 04 Oct 2024 02:59:52 -0700 (PDT)","From":"Harvey Yang ","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Cc":"Harvey Yang ,\n\tHarvey Yang ,\n\tKieran Bingham ,\n\tJacopo Mondi ","Subject":"[PATCH 15 1/7] libcamera: add DmaBufAllocator::exportBuffers()","Date":"Fri, 4 Oct 2024 09:59:14 +0000","Message-ID":"<20241004095946.264537-2-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.47.0.rc0.187.ge670bccf7e-goog","In-Reply-To":"<20241004095946.264537-1-chenghaoyang@google.com>","References":"<20241004095946.264537-1-chenghaoyang@google.com>","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":"","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 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 \nReviewed-by: Kieran Bingham \nReviewed-by: Jacopo Mondi \n---\n .../libcamera/internal/dma_buf_allocator.h | 13 +++++\n src/libcamera/dma_buf_allocator.cpp | 57 +++++++++++++++++++\n 2 files changed, 70 insertions(+)","diff":"diff --git a/include/libcamera/internal/dma_buf_allocator.h b/include/libcamera/internal/dma_buf_allocator.h\nindex d2a0a0d19..9211d4837 100644\n--- a/include/libcamera/internal/dma_buf_allocator.h\n+++ b/include/libcamera/internal/dma_buf_allocator.h\n@@ -7,11 +7,17 @@\n \n #pragma once\n \n+#include \n+#include \n+#include \n+\n #include \n #include \n \n namespace libcamera {\n \n+class FrameBuffer;\n+\n class DmaBufAllocator\n {\n public:\n@@ -28,7 +34,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 &planeSizes,\n+\t\t\t std::vector> *buffers);\n+\n private:\n+\tstd::unique_ptr createBuffer(\n+\t\tstd::string name, const std::vector &planeSizes);\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..262eb53a0 100644\n--- a/src/libcamera/dma_buf_allocator.cpp\n+++ b/src/libcamera/dma_buf_allocator.cpp\n@@ -22,6 +22,9 @@\n \n #include \n #include \n+#include \n+\n+#include \n \n /**\n * \\file dma_buf_allocator.cpp\n@@ -205,4 +208,58 @@ 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] planeSizes The sizes of planes in each FrameBuffer\n+ * \\param[out] buffers Array of buffers successfully allocated\n+ *\n+ * Planes in a FrameBuffer are allocated with a single dma buf.\n+ * \\todo Add the option to allocate each plane with a dma buf respectively.\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 &planeSizes,\n+\t\t\t\t std::vector> *buffers)\n+{\n+\tfor (unsigned int i = 0; i < count; ++i) {\n+\t\tstd::unique_ptr buffer =\n+\t\t\tcreateBuffer(\"frame-\" + std::to_string(i), planeSizes);\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\n+DmaBufAllocator::createBuffer(std::string name,\n+\t\t\t const std::vector &planeSizes)\n+{\n+\tstd::vector planes;\n+\n+\tunsigned int frameSize = 0, offset = 0;\n+\tfor (auto planeSize : planeSizes)\n+\t\tframeSize += planeSize;\n+\n+\tSharedFD fd(alloc(name.c_str(), frameSize));\n+\tif (!fd.isValid())\n+\t\treturn nullptr;\n+\n+\tfor (auto planeSize : planeSizes) {\n+\t\tplanes.emplace_back(FrameBuffer::Plane{ fd, offset, planeSize });\n+\t\toffset += planeSize;\n+\t}\n+\n+\treturn std::make_unique(planes);\n+}\n+\n } /* namespace libcamera */\n","prefixes":["15","1/7"]}