{"id":18488,"url":"https://patchwork.libcamera.org/api/1.1/patches/18488/?format=json","web_url":"https://patchwork.libcamera.org/patch/18488/","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":"<20230328095534.3584-4-harveyycyang@gmail.com>","date":"2023-03-28T09:55:34","name":"[libcamera-devel,v4,3/3] libcamera: Add exportFrameBuffers in HeapAllocator","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2cbe4d98f443e1be399cb89ba496d2adf5dfe461","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/18488/mbox/","series":[{"id":3823,"url":"https://patchwork.libcamera.org/api/1.1/series/3823/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3823","date":"2023-03-28T09:55:31","name":"Add HeapAllocator","version":4,"mbox":"https://patchwork.libcamera.org/series/3823/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18488/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18488/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 D4733C329C\n\tfor ;\n\tTue, 28 Mar 2023 09:55:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8EC766275E;\n\tTue, 28 Mar 2023 11:55:44 +0200 (CEST)","from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com\n\t[IPv6:2607:f8b0:4864:20::1031])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 351246273D\n\tfor ;\n\tTue, 28 Mar 2023 11:55:42 +0200 (CEST)","by mail-pj1-x1031.google.com with SMTP id d13so10330041pjh.0\n\tfor ;\n\tTue, 28 Mar 2023 02:55:42 -0700 (PDT)","from harveyyang.localdomain (1-163-26-93.dynamic-ip.hinet.net.\n\t[1.163.26.93]) by smtp.gmail.com with ESMTPSA id\n\tv21-20020aa78515000000b006259beddb63sm20241488pfn.44.2023.03.28.02.55.39\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 28 Mar 2023 02:55:40 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1679997344;\n\tbh=rKkP6APJoA9gPyVjCqIRpYkSaFXNsNkeFUkaXQOrw5A=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=hIaOq6Nzy8sBj8Jab8NxHU4b4rSy1sXjc8vD8x6A8vDz6GuQ7VD3CNzzLOrTWfG7a\n\t8gt0OMdQgh1rn2p2Ft1gtXoLhW0vf6ClPVgwN8EYATVb3axauW9hjL8i+b60aiox3F\n\t6rfnJ0E6dcK7H1T7mZEJ54rQINo/IKs1BDK4W6zzxADEvgpLVJXv7AhJ/g8p+GBHUW\n\tC5n1BkfXJVpMY/I7+KD9RMS6GzqfRANgQmZpcEmizZzKFWJ6iCLY2PjoMAS50hYYwF\n\txN/tsipGI6moa+Fn1wqizgN0foyEwELKj/GmTu0QW+kmWP8YW0NeZxpAt71VkOcdyT\n\tLuD/u3GV//iRg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1679997340;\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=AnZvnxHR0i8wKScqjrDBwNbGDayWUHwb6jiPkaTvz0s=;\n\tb=WuXRtnJdkWQE388DhJlwPb2HMuu4Ojd0UtJO4Zi4sPHobgT8qekCJKxiwEPF8w3kmw\n\th9AaLN+G+BvjqGfsA6Fx4u6IIbb18dYyorfurMPan47j9tx/wqX96mrd7DAqYvsqbF3r\n\tDlzRyqzLg4qOhwQordUEEy4Y1oBYBD0xE3vMQ="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"WuXRtnJd\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112; t=1679997340;\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=AnZvnxHR0i8wKScqjrDBwNbGDayWUHwb6jiPkaTvz0s=;\n\tb=4S7jxACPLJ5tKk+1pS8KpY35OolOxaIZQoUA6eSOQHr/L8znBHgf8aWh7kxNiKf4t0\n\tg/1RLKTs2HxpgbsPVQuOG/jqG6LRx5Kkgi5SStYew8/uJLOd8lgnVAUUjBo2gdTQbmQn\n\tYaliYwwwbmqrps21ae4hVM+dhVZ9DOh09sWZZLrgDbEFj3blbnTFU72+5RhDjTc7FX4P\n\twpaJDCfosv8P+7sRicvYV7m9DmhcqGlxZ/mtdn+WJw+5gi8mvd03wkaroywzMucg6tdF\n\tmaD7xragTnc29ZnKqwa8W1J6vwqg1zd2F3xu1dbLj1UiHLAv5ZS2kcbmoAWroK/ZvJv/\n\t+JUQ==","X-Gm-Message-State":"AO0yUKVw59+hwthOo1RQFQPQ7E/dVgM28ABCOF+kkGJjPripPhukWARl\n\tpJ0ZPIQNPGlyyNAJi2lrnIZCXuwnP/lsT61rB6DqNg==","X-Google-Smtp-Source":"AK7set9R3fnmT4Ti0KtDADvAI7yNjueZeEEZ2DHW/pw9FSTJpxs+pFOKay9p2EZ2m0jSevSPnkDbzA==","X-Received":"by 2002:a05:6a20:7187:b0:d9:f086:e756 with SMTP id\n\ts7-20020a056a20718700b000d9f086e756mr13977925pzb.39.1679997340440; \n\tTue, 28 Mar 2023 02:55:40 -0700 (PDT)","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 28 Mar 2023 17:55:34 +0800","Message-Id":"<20230328095534.3584-4-harveyycyang@gmail.com>","X-Mailer":"git-send-email 2.40.0","In-Reply-To":"<20230328095534.3584-1-harveyycyang@gmail.com>","References":"<20230328095534.3584-1-harveyycyang@gmail.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 3/3] libcamera: Add exportFrameBuffers\n\tin HeapAllocator","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","From":"Harvey Yang via libcamera-devel ","Reply-To":"Harvey Yang ","Cc":"Cheng-Hao Yang ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Cheng-Hao Yang \n\nAdd a helper function exportFrameBuffers in HeapAllocator to make it\neasier to use.\n\nSigned-off-by: Harvey Yang \n---\n include/libcamera/heap_allocator.h | 11 ++++++\n src/libcamera/heap_allocator.cpp | 56 ++++++++++++++++++++++++++++++\n 2 files changed, 67 insertions(+)","diff":"diff --git a/include/libcamera/heap_allocator.h b/include/libcamera/heap_allocator.h\nindex cd7ed1a3..076f0951 100644\n--- a/include/libcamera/heap_allocator.h\n+++ b/include/libcamera/heap_allocator.h\n@@ -8,6 +8,7 @@\n #pragma once\n \n #include \n+#include \n \n #include \n \n@@ -15,6 +16,11 @@\n \n namespace libcamera {\n \n+class Camera;\n+class Stream;\n+class FrameBuffer;\n+class PixelFormatInfo;\n+\n class HeapAllocator\n {\n public:\n@@ -23,7 +29,12 @@ public:\n \tbool isValid() const { return heap_->isValid(); }\n \tUniqueFD alloc(const char *name, std::size_t size);\n \n+\tint exportFrameBuffers(Camera *camera, Stream *stream,\n+\t\t\t std::vector> *buffers);\n+\n private:\n+\tstd::unique_ptr createBuffer(Stream *stream);\n+\n \tstd::unique_ptr heap_;\n };\n \ndiff --git a/src/libcamera/heap_allocator.cpp b/src/libcamera/heap_allocator.cpp\nindex 179c2c21..33e9eaca 100644\n--- a/src/libcamera/heap_allocator.cpp\n+++ b/src/libcamera/heap_allocator.cpp\n@@ -17,7 +17,11 @@\n \n #include \n \n+#include \n #include \n+#include \n+#include \n+#include \n #include \n \n namespace libcamera {\n@@ -43,4 +47,56 @@ UniqueFD HeapAllocator::alloc(const char *name, std::size_t size)\n \treturn heap_->alloc(name, size);\n }\n \n+int HeapAllocator::exportFrameBuffers([[maybe_unused]] Camera *camera, Stream *stream,\n+\t\t\t\t std::vector> *buffers)\n+{\n+\tunsigned int count = stream->configuration().bufferCount;\n+\n+\t/** \\todo: Support multiplanar allocations */\n+\n+\tfor (unsigned i = 0; i < count; ++i) {\n+\t\tstd::unique_ptr buffer = createBuffer(stream);\n+\t\tif (!buffer) {\n+\t\t\tLOG(HeapAllocator, 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 HeapAllocator::createBuffer(Stream *stream)\n+{\n+\tstd::vector planes;\n+\n+\tint num_page = (stream->configuration().frameSize + getpagesize() - 1) / getpagesize();\n+\n+\tUniqueFD fd = alloc(\"Buffer\", num_page * getpagesize());\n+\tif (!fd.isValid())\n+\t\treturn nullptr;\n+\n+\tauto info = PixelFormatInfo::info(stream->configuration().pixelFormat);\n+\tSharedFD shared_fd(std::move(fd));\n+\tunsigned int offset = 0;\n+\tfor (long unsigned int i = 0; i < info.planes.size(); ++i) {\n+\t\tunsigned int planeSize = info.planeSize(stream->configuration().size, i);\n+\t\tif (planeSize == 0)\n+\t\t\tcontinue;\n+\n+\t\tFrameBuffer::Plane plane;\n+\t\tplane.fd = shared_fd;\n+\t\tplane.offset = offset;\n+\t\tplane.length = planeSize;\n+\t\tplanes.push_back(std::move(plane));\n+\n+\t\toffset += planeSize;\n+\t}\n+\n+\treturn std::make_unique(planes);\n+}\n+\n } /* namespace libcamera */\n","prefixes":["libcamera-devel","v4","3/3"]}