From patchwork Fri Oct 4 09:59:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harvey Yang X-Patchwork-Id: 21503 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 86C40C3257 for ; Fri, 4 Oct 2024 09:59:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4255D63531; Fri, 4 Oct 2024 11:59:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="RvXS40aD"; dkim-atps=neutral Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3D6466352B for ; Fri, 4 Oct 2024 11:59:54 +0200 (CEST) Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-7124395ca86so859025a34.0 for ; Fri, 04 Oct 2024 02:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1728035993; x=1728640793; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=llkXwXEbrhhVjPAPlCwKt6WULyQC7Ghp18EkJKUOl4E=; b=RvXS40aDpcMWq9tzdVsBn45WjJjoz3DDXIVKgEbkaJP2VUrFWDsZAEhgmnZBiSdx/t AUHEs39ZqPmb1jmWwRgp7Vb5VisPkJEHUJS+n6EcoXhCmaaKgu4Ibm7ZdyJcSJiTQ2Xc Tm9Tw50BcOkIcboD9nz7Q0XbQd6BBnnKivDhs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728035993; x=1728640793; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=llkXwXEbrhhVjPAPlCwKt6WULyQC7Ghp18EkJKUOl4E=; b=kSskorlwl6lNe9k4d4BIHNFlhWGBUA6owmL74scFBgRpl7JFU3jp4INR1cQjITcCzk Z8aLPCkbVDFCRjprKmMjlZjZxfZbShhAz+VTaNtLdeHQVExlVlnRKdM8hASKxrmjVAin b7e9vW0Wi30618XruErM+j8QLZ00YsG3gyKJ7F2Qhps5R8aT2TKDP8SGMt6CgMIGd2ca ogixZzR9Rb1XLTZ0spiKwYFKBMaFSaZox4VZsRZf5pMFOLLcsd7yxrjPCX+OaIJmx9ON 4wJtJGEw/MMl26ipd9eImc30pKl8fcYdXCuQ1PMVcczWbO1JBXpiefNs9RDGXmxOQB1k VZwA== X-Gm-Message-State: AOJu0YzfHXFxdysYm5gG1gcDQmL4p5yREdQmiZNtDUPme8AHWQVOAiUu MLx5TSOGf7L7wWAYXAGE1Bz8Rz6kDOP/MrCe9yrN3ibr3Ljeqc5oWbs40TBuUWFS5ojoxScOHYM = X-Google-Smtp-Source: AGHT+IFkbKL6kbVX3lRTibASKtGE5BLBYAa6qvB3WwAPvANnE9m7QikXA51G1K/+kg1SQ0awvIhXtA== X-Received: by 2002:a05:6830:4983:b0:713:d15b:6cb7 with SMTP id 46e09a7af769-7154e81a831mr2286204a34.4.1728035992690; Fri, 04 Oct 2024 02:59:52 -0700 (PDT) Received: from chenghaoyang-low.c.googlers.com.com (27.247.221.35.bc.googleusercontent.com. [35.221.247.27]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71ded2ad931sm316911b3a.41.2024.10.04.02.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 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 , Harvey Yang , Kieran Bingham , Jacopo 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 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a helper function exportBuffers in DmaBufAllocator to make it easier to use. It'll be used in Virtual Pipeline Handler and SoftwareIsp. Signed-off-by: Harvey Yang Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- .../libcamera/internal/dma_buf_allocator.h | 13 +++++ src/libcamera/dma_buf_allocator.cpp | 57 +++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/include/libcamera/internal/dma_buf_allocator.h b/include/libcamera/internal/dma_buf_allocator.h index d2a0a0d19..9211d4837 100644 --- a/include/libcamera/internal/dma_buf_allocator.h +++ b/include/libcamera/internal/dma_buf_allocator.h @@ -7,11 +7,17 @@ #pragma once +#include +#include +#include + #include #include namespace libcamera { +class FrameBuffer; + class DmaBufAllocator { public: @@ -28,7 +34,14 @@ public: bool isValid() const { return providerHandle_.isValid(); } UniqueFD alloc(const char *name, std::size_t size); + int exportBuffers(unsigned int count, + const std::vector &planeSizes, + std::vector> *buffers); + private: + std::unique_ptr createBuffer( + std::string name, const std::vector &planeSizes); + UniqueFD allocFromHeap(const char *name, std::size_t size); UniqueFD allocFromUDmaBuf(const char *name, std::size_t size); UniqueFD providerHandle_; diff --git a/src/libcamera/dma_buf_allocator.cpp b/src/libcamera/dma_buf_allocator.cpp index be6efb89f..262eb53a0 100644 --- a/src/libcamera/dma_buf_allocator.cpp +++ b/src/libcamera/dma_buf_allocator.cpp @@ -22,6 +22,9 @@ #include #include +#include + +#include /** * \file dma_buf_allocator.cpp @@ -205,4 +208,58 @@ UniqueFD DmaBufAllocator::alloc(const char *name, std::size_t size) return allocFromHeap(name, size); } +/** + * \brief Allocate and export buffers from the DmaBufAllocator + * \param[in] count The number of requested FrameBuffers + * \param[in] planeSizes The sizes of planes in each FrameBuffer + * \param[out] buffers Array of buffers successfully allocated + * + * Planes in a FrameBuffer are allocated with a single dma buf. + * \todo Add the option to allocate each plane with a dma buf respectively. + * + * \return The number of allocated buffers on success or a negative error code + * otherwise + */ +int DmaBufAllocator::exportBuffers(unsigned int count, + const std::vector &planeSizes, + std::vector> *buffers) +{ + for (unsigned int i = 0; i < count; ++i) { + std::unique_ptr buffer = + createBuffer("frame-" + std::to_string(i), planeSizes); + if (!buffer) { + LOG(DmaBufAllocator, Error) << "Unable to create buffer"; + + buffers->clear(); + return -EINVAL; + } + + buffers->push_back(std::move(buffer)); + } + + return count; +} + +std::unique_ptr +DmaBufAllocator::createBuffer(std::string name, + const std::vector &planeSizes) +{ + std::vector planes; + + unsigned int frameSize = 0, offset = 0; + for (auto planeSize : planeSizes) + frameSize += planeSize; + + SharedFD fd(alloc(name.c_str(), frameSize)); + if (!fd.isValid()) + return nullptr; + + for (auto planeSize : planeSizes) { + planes.emplace_back(FrameBuffer::Plane{ fd, offset, planeSize }); + offset += planeSize; + } + + return std::make_unique(planes); +} + } /* namespace libcamera */