{"id":21415,"url":"https://patchwork.libcamera.org/api/1.1/patches/21415/?format=json","web_url":"https://patchwork.libcamera.org/patch/21415/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240930063342.3014837-2-chenghaoyang@google.com>","date":"2024-09-30T06:29:42","name":"[v14,1/7] libcamera: add DmaBufAllocator::exportBuffers()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b9357590e7ea3b862e2e8314f6d4a470782487c8","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/1.1/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21415/mbox/","series":[{"id":4637,"url":"https://patchwork.libcamera.org/api/1.1/series/4637/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4637","date":"2024-09-30T06:29:41","name":"Add VirtualPipelineHandler","version":14,"mbox":"https://patchwork.libcamera.org/series/4637/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21415/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21415/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 B7D23C32D4\n\tfor ;\n\tMon, 30 Sep 2024 06:33:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A318F63518;\n\tMon, 30 Sep 2024 08:33:57 +0200 (CEST)","from mail-pf1-x434.google.com (mail-pf1-x434.google.com\n\t[IPv6:2607:f8b0:4864:20::434])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 246B46350F\n\tfor ;\n\tMon, 30 Sep 2024 08:33:51 +0200 (CEST)","by mail-pf1-x434.google.com with SMTP id\n\td2e1a72fcca58-71971d2099cso3268312b3a.2\n\tfor ;\n\tSun, 29 Sep 2024 23:33:51 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(208.158.221.35.bc.googleusercontent.com. [35.221.158.208])\n\tby smtp.gmail.com with ESMTPSA id\n\td2e1a72fcca58-71b265166e2sm5487671b3a.131.2024.09.29.23.33.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 29 Sep 2024 23:33:48 -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=\"G57J0jVc\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1727678029; x=1728282829;\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=KYSCW2eznOAuCeDgQqEiD1QpvzOUGC3v4J7VHyWiUIo=;\n\tb=G57J0jVcJvBbmetJ62YzWj+tJA3sklKQAyKmy/j/KFUDQ69A/0cqPpSTl8Z0Sxj6o8\n\tIxXOGC2Dc2rAfWWYmR7LhjOnSVUYwTU4zvSpta6RyjP6ZfXcaEmcduabQc+m0QKfydJG\n\tv+ICQxNh5hjFMxbwvOaJq4tE7aVNpvQa5bymE=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1727678029; x=1728282829;\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=KYSCW2eznOAuCeDgQqEiD1QpvzOUGC3v4J7VHyWiUIo=;\n\tb=CSbGZ4ix3RdXY3loxOdwD0yhZin5Vr0sJpE6BlwJizZp1ozII02DO0fta5OUNLBtb/\n\t/JaVdiv/UBA9OpF7WiPunomY34MvY1eTtlaCJK2mexjYHiLli7NkBy51EWXoPaBQAEIE\n\tQ4oi6x3P5WIEVee/G06/S1xqZwfkBd+ku61j3SrFF9dsw1Yx16ZalEy0C1OkpB/FuRCS\n\tpzVFLCaGAERxQXQfyMozqcdxhqHoBgmjDNGskyeXg4UD7NoVUXFUKBDBHrSEV4lYSrIm\n\tVMw6T+DMjrxJNbAmJEp8Qq2HA+88RBFS0vAQw/lrXT4uQuiYiXPfxbMIW0DWkQVSsAMk\n\tDBRw==","X-Gm-Message-State":"AOJu0YxPRfVou+7rd5dTAtPBFiPHUI0nII4EpuD5Mzo65UYWsX38HJP7\n\t5XOMOpzZPIw1lVuEcWX1Q4TG/HZNeaVBCZYkXBPC8lxlRmrr9j+k8VmJKYcsCAE3RQ9Q8wOuEuI\n\t=","X-Google-Smtp-Source":"AGHT+IHTM1CmX5ehzEM3kxh5RF41j7+zN9LyNjVIo54n3wAf6QiO4XLetsfQYZFw/WJyUBwveuBwVw==","X-Received":"by 2002:a05:6a00:4fd2:b0:717:87d6:fdd2 with SMTP id\n\td2e1a72fcca58-71b25f00ff4mr19143193b3a.4.1727678029187; \n\tSun, 29 Sep 2024 23:33:49 -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 v14 1/7] libcamera: add DmaBufAllocator::exportBuffers()","Date":"Mon, 30 Sep 2024 06:29:42 +0000","Message-ID":"<20240930063342.3014837-2-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.46.1.824.gd892dcdcdd-goog","In-Reply-To":"<20240930063342.3014837-1-chenghaoyang@google.com>","References":"<20240930063342.3014837-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 d2a0a0d1..66d3b419 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 &frameSize,\n+\t\t\t std::vector> *buffers);\n+\n private:\n+\tstd::unique_ptr createBuffer(\n+\t\tstd::string name, const std::vector &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 be6efb89..f8ed3de2 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] frameSizes 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 &frameSizes,\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), 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\n+DmaBufAllocator::createBuffer(std::string name,\n+\t\t\t const std::vector &frameSizes)\n+{\n+\tstd::vector 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(planes);\n+}\n+\n } /* namespace libcamera */\n","prefixes":["v14","1/7"]}