Patch Detail
Show a patch.
GET /api/1.1/patches/20702/?format=api
{ "id": 20702, "url": "https://patchwork.libcamera.org/api/1.1/patches/20702/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20702/", "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": "<20240726095626.3632402-2-chenghaoyang@chromium.org>", "date": "2024-07-26T09:54:22", "name": "[v6,1/7] Add a helper function exportFrameBuffers in DmaBufAllocator to make it easier to use.", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "bd56d577babe94a6ac00171c79443424212d3cfc", "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/20702/mbox/", "series": [ { "id": 4461, "url": "https://patchwork.libcamera.org/api/1.1/series/4461/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4461", "date": "2024-07-26T09:54:21", "name": "Add VirtualPipelineHandler", "version": 6, "mbox": "https://patchwork.libcamera.org/series/4461/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20702/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20702/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 E4957BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 26 Jul 2024 09:56:40 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B744463373;\n\tFri, 26 Jul 2024 11:56:36 +0200 (CEST)", "from mail-pl1-x633.google.com (mail-pl1-x633.google.com\n\t[IPv6:2607:f8b0:4864:20::633])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C9F6A61994\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Jul 2024 11:56:33 +0200 (CEST)", "by mail-pl1-x633.google.com with SMTP id\n\td9443c01a7336-1fc587361b6so4101725ad.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 26 Jul 2024 02:56:33 -0700 (PDT)", "from chenghaoyang-low.c.googlers.com.com\n\t(148.175.199.104.bc.googleusercontent.com. [104.199.175.148])\n\tby smtp.gmail.com with ESMTPSA id\n\td9443c01a7336-1fed7c7f63asm28396665ad.46.2024.07.26.02.56.30\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 26 Jul 2024 02:56:31 -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=\"hjDYzAmq\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1721987792; x=1722592592;\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=92eGQpIxfgbeaJOI/KHsvmgmx/r97AIsQENTaLGeeDQ=;\n\tb=hjDYzAmq3wjtPEoA2Zmv4CgpDjlSzlFmFGQ8glCOji7N4zrzsFL0O3mv8d8IthdfzR\n\tPu8u5I64sBBbBC7vAr/OQZw70EznGgLL3eK3plxGNdHi/0JrZJ201c34zrAuoQ7RavTA\n\tHsnzitZS+ctw4Yvc5uYL7h1uDi3FCuW3jCeYM=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1721987792; x=1722592592;\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=92eGQpIxfgbeaJOI/KHsvmgmx/r97AIsQENTaLGeeDQ=;\n\tb=o5W159/Ks/JJ44CQ4BBDYIEdJ5L/xYr/j13qskY+WPqV3hT3X8Ej22Mik+Atu0xms9\n\taTe3PWU7FgBykQt5KmiZn6TLib/DgVL4y3mWxXNaq/jJkDqaHiivc2mCTRRkejseBwwB\n\teNgL7WbLlNYK+lujiyGIoe2G9B64uIjohKEAkXbf6lViwtj18FbUr0ZePhtlFHCZOvjX\n\tUxmp0zR1Hrl20B3cvPiTgGO46pXczZtZyz26+JCZ/RUzRyPyrBXSCYoe9nooom9As/Wd\n\tRj36CB2+XH8vBo7r5qhUMDPbOux9aDV0RX9w6ZtwEelw15Z07/mjxUqtDEwBc6SOC5vG\n\tjQ/g==", "X-Gm-Message-State": "AOJu0YzVifsEbBKEpxJrL7C69KTEp3JyavVMUusHVIcflNtfYtnDpOSo\n\trmyCT/NbGt8dvACU2lW5cSGEu6fFJq8DVWWJex4NHdbannCxpgYuvYN4UGo64N8uwKQDzUbSBxl\n\tv8Q==", "X-Google-Smtp-Source": "AGHT+IH84Yf4ZXnaYFaUuZpLvEgTgj9LaBY99bOsQtsBMrgf2k8tEzCNzob5U5mcl4x32vF4sa0jfw==", "X-Received": "by 2002:a17:902:c409:b0:1fd:8c42:61ca with SMTP id\n\td9443c01a7336-1fed9255795mr53627135ad.25.1721987791931; \n\tFri, 26 Jul 2024 02:56:31 -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 v6 1/7] Add a helper function exportFrameBuffers in\n\tDmaBufAllocator to make it easier to use.", "Date": "Fri, 26 Jul 2024 09:54:22 +0000", "Message-ID": "<20240726095626.3632402-2-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.46.0.rc1.232.g9752f9e123-goog", "In-Reply-To": "<20240726095626.3632402-1-chenghaoyang@chromium.org>", "References": "<20240726095626.3632402-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\nIt'll be used in Virtual Pipeline Handler specifically.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n\nChange-Id: Ieac63dc7b2aef7dda525e59cce232dd63d316417\n---\n .../libcamera/internal/dma_buf_allocator.h | 10 ++++\n src/libcamera/dma_buf_allocator.cpp | 57 ++++++++++++++++++-\n 2 files changed, 65 insertions(+), 2 deletions(-)", "diff": "diff --git a/include/libcamera/internal/dma_buf_allocator.h b/include/libcamera/internal/dma_buf_allocator.h\nindex 36ec1696b..dd2cc2372 100644\n--- a/include/libcamera/internal/dma_buf_allocator.h\n+++ b/include/libcamera/internal/dma_buf_allocator.h\n@@ -8,12 +8,16 @@\n #pragma once\n \n #include <stddef.h>\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+struct StreamConfiguration;\n+\n class DmaBufAllocator\n {\n public:\n@@ -30,7 +34,13 @@ public:\n \tbool isValid() const { return providerHandle_.isValid(); }\n \tUniqueFD alloc(const char *name, std::size_t size);\n \n+\tint exportFrameBuffers(\n+\t\tconst StreamConfiguration &config,\n+\t\tstd::vector<std::unique_ptr<FrameBuffer>> *buffers);\n+\n private:\n+\tstd::unique_ptr<FrameBuffer> createBuffer(const StreamConfiguration &config);\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 c06eca7d0..04079b682 100644\n--- a/src/libcamera/dma_buf_allocator.cpp\n+++ b/src/libcamera/dma_buf_allocator.cpp\n@@ -23,6 +23,11 @@\n \n #include <libcamera/base/log.h>\n \n+#include <libcamera/framebuffer.h>\n+#include <libcamera/stream.h>\n+\n+#include \"libcamera/internal/formats.h\"\n+\n /**\n * \\file dma_buf_allocator.cpp\n * \\brief dma-buf allocator\n@@ -130,8 +135,8 @@ DmaBufAllocator::~DmaBufAllocator() = default;\n /* uClibc doesn't provide the file sealing API. */\n #ifndef __DOXYGEN__\n #if not HAVE_FILE_SEALS\n-#define F_ADD_SEALS\t\t1033\n-#define F_SEAL_SHRINK\t\t0x0002\n+#define F_ADD_SEALS 1033\n+#define F_SEAL_SHRINK 0x0002\n #endif\n #endif\n \n@@ -243,4 +248,52 @@ UniqueFD DmaBufAllocator::alloc(const char *name, std::size_t size)\n \t\treturn allocFromHeap(name, size);\n }\n \n+int DmaBufAllocator::exportFrameBuffers(\n+\tconst StreamConfiguration &config,\n+\tstd::vector<std::unique_ptr<FrameBuffer>> *buffers)\n+{\n+\tunsigned int count = config.bufferCount;\n+\n+\tfor (unsigned i = 0; i < count; ++i) {\n+\t\tstd::unique_ptr<FrameBuffer> buffer = createBuffer(config);\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> DmaBufAllocator::createBuffer(\n+\tconst StreamConfiguration &config)\n+{\n+\tstd::vector<FrameBuffer::Plane> planes;\n+\n+\tauto info = PixelFormatInfo::info(config.pixelFormat);\n+\tfor (size_t i = 0; i < info.planes.size(); ++i) {\n+\t\tunsigned int planeSize = info.planeSize(config.size, i);\n+\t\tif (planeSize == 0)\n+\t\t\tcontinue;\n+\n+\t\tUniqueFD fd = alloc(\"FrameBuffer\", planeSize);\n+\t\tif (!fd.isValid())\n+\t\t\treturn nullptr;\n+\n+\t\tSharedFD sharedFd(std::move(fd));\n+\n+\t\tFrameBuffer::Plane plane;\n+\t\tplane.fd = sharedFd;\n+\t\tplane.offset = 0;\n+\t\tplane.length = planeSize;\n+\t\tplanes.push_back(std::move(plane));\n+\t}\n+\n+\treturn std::make_unique<FrameBuffer>(planes);\n+}\n+\n } /* namespace libcamera */\n", "prefixes": [ "v6", "1/7" ] }