Patch Detail
Show a patch.
GET /api/patches/15744/?format=api
{ "id": 15744, "url": "https://patchwork.libcamera.org/api/patches/15744/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15744/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20220428095544.2795980-3-chenghaoyang@chromium.org>", "date": "2022-04-28T09:55:40", "name": "[libcamera-devel,v4,2/6] Add HALFrameBuffer and replace FrameBuffer in src/android", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f45cd8980f5097b25e7b9b2fe6188571cb22924b", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15744/mbox/", "series": [ { "id": 3081, "url": "https://patchwork.libcamera.org/api/series/3081/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3081", "date": "2022-04-28T09:55:38", "name": "Add CrOS JEA implementation", "version": 4, "mbox": "https://patchwork.libcamera.org/series/3081/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15744/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15744/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 8E4FDC3256\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 28 Apr 2022 09:56:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4064D6564B;\n\tThu, 28 Apr 2022 11:56:00 +0200 (CEST)", "from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com\n\t[IPv6:2607:f8b0:4864:20::62b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8FCC865640\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 Apr 2022 11:55:58 +0200 (CEST)", "by mail-pl1-x62b.google.com with SMTP id q13so20816plr.10\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 Apr 2022 02:55:58 -0700 (PDT)", "from chenghaoyang.c.googlers.com.com\n\t(93.135.240.35.bc.googleusercontent.com. [35.240.135.93])\n\tby smtp.gmail.com with ESMTPSA id\n\tx6-20020a17090a46c600b001d960eaed66sm5861256pjg.42.2022.04.28.02.55.55\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 28 Apr 2022 02:55:56 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1651139760;\n\tbh=FL4CukYIa/gQfym5LNrbRBXQpb7DJCUnbFkpwtp2T4c=;\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=v5wPiUFJdFChwXKq+0DDIRXddb0TOIbnJBEQLYVuhqpewqHuT2faPlOYP/ERUUmtq\n\tyWALz02xSE7AOG1NHUfC39JjhAh2M2w7DGl6kA9cYFw5KVi8P6hBW31K1o/nPxPu03\n\tm9ivMpZVmwIba6YzLhW9ybGuMDOrNBIbLkwnnewzf3MnRODnJ08vajWP6hYYmk0i8H\n\t+yepTpiUfxtuXoCLHPJVIiDdGf8uoqHI1DXl0I6NnshJMtSzqU10NmwqoPhWmFvfln\n\tbd4zqLXKUwmEqCxhvh0g8krBWZlHdQgbH5A4jPUbABD2nRveR8t5iXmahZmOGeSOax\n\tGcMjfcNFa7qGQ==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=6cVbQbgEIPaNhwVbTacUHdQMEaMWbOKLd/Ic82wjmCM=;\n\tb=kd3bVmGWrW8IUipZtYwkuODguKx3yuvWlLYyJG28vOO1CP9tSUrBsZH9Tg+0z42h1c\n\tDQ1Olbhq0PHR60Nlie+iWvvwSeOdBpXIefrFjkz2qof9Dj3jx62ZmvWtoNKJ5oE9rUv4\n\tmDuYgA9T1rkbMIe08hEGM0eNLaZW3Zkgw7C3w=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"kd3bVmGW\"; \n\tdkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=6cVbQbgEIPaNhwVbTacUHdQMEaMWbOKLd/Ic82wjmCM=;\n\tb=xSmhDo+0d0kI23pHoX9NNde4TXu0IZ0pj66x0o2M5HNfTZXoi/jw+zs0MRqNBtX58X\n\tOiVylVXAKXpHDegCbkYpWgx7P8BeE+mnkDY0r16PHGGFPu1BV+KL0dw9jsfSeUl5cuYm\n\tR/YSKd6aQOlcECfmJkMVy5a+yuFysohoSYfSUHJl5gsro4L1dLRxiaLG4rXYr4kE6LL8\n\tGOSjSipLHzRIpD6Xf7+MBLy5yswGuuJesK2SMC+9TXyBRr72ePlG+koU1m1XI6Q+sryk\n\tqxF4fgkGmSh9lI1cuNGyCiXm+KvusVwAzn25gBkaztDtH5+YrVHYriifG0PyIO1t5aRX\n\t8hLw==", "X-Gm-Message-State": "AOAM532QB++jAHJQrwdqEA5AvD+R5/rZM4HYdFXGqg/Cj+9RLbW8HGh/\n\toOUfJgupGWslIS5LvG++TeTxhe8AyB+kTy4Y", "X-Google-Smtp-Source": "ABdhPJzb+VwttoAXyp3pvQq9Yd/wuw5mgCwhmpwONFsSTn5Ll3q49LNuZerRNxzC/py6IIxAcCP8ow==", "X-Received": "by 2002:a17:90a:1116:b0:1d9:a41a:d13d with SMTP id\n\td22-20020a17090a111600b001d9a41ad13dmr16847409pja.206.1651139756769; \n\tThu, 28 Apr 2022 02:55:56 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 28 Apr 2022 09:55:40 +0000", "Message-Id": "<20220428095544.2795980-3-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog", "In-Reply-To": "<20220428095544.2795980-1-chenghaoyang@chromium.org>", "References": "<20220428095544.2795980-1-chenghaoyang@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4 2/6] Add HALFrameBuffer and replace\n\tFrameBuffer in src/android", "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>", "From": "Harvey Yang via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Harvey Yang <chenghaoyang@chromium.org>", "Cc": "Harvey Yang <chenghaoyang@chromium.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "AndroidFrameBuffer is derived from FrameBuffer with access to\nbuffer_handle_t, which is needed for JEA usage.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/android/camera_device.cpp | 3 ++-\n src/android/frame_buffer_allocator.h | 7 ++---\n src/android/hal_framebuffer.cpp | 25 +++++++++++++++++\n src/android/hal_framebuffer.h | 27 +++++++++++++++++++\n src/android/meson.build | 1 +\n .../mm/cros_frame_buffer_allocator.cpp | 14 ++++++----\n .../mm/generic_frame_buffer_allocator.cpp | 12 +++++----\n 7 files changed, 75 insertions(+), 14 deletions(-)\n create mode 100644 src/android/hal_framebuffer.cpp\n create mode 100644 src/android/hal_framebuffer.h", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 00d48471..2a35d686 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -29,6 +29,7 @@\n #include \"camera_hal_config.h\"\n #include \"camera_ops.h\"\n #include \"camera_request.h\"\n+#include \"hal_framebuffer.h\"\n \n using namespace libcamera;\n \n@@ -754,7 +755,7 @@ CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer,\n \t\tplanes[i].length = buf.size(i);\n \t}\n \n-\treturn std::make_unique<FrameBuffer>(planes);\n+\treturn std::make_unique<HALFrameBuffer>(planes, camera3buffer);\n }\n \n int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\ndiff --git a/src/android/frame_buffer_allocator.h b/src/android/frame_buffer_allocator.h\nindex 5d2eeda1..164ff01d 100644\n--- a/src/android/frame_buffer_allocator.h\n+++ b/src/android/frame_buffer_allocator.h\n@@ -13,9 +13,10 @@\n #include <libcamera/base/class.h>\n \n #include <libcamera/camera.h>\n-#include <libcamera/framebuffer.h>\n #include <libcamera/geometry.h>\n \n+#include \"hal_framebuffer.h\"\n+\n class CameraDevice;\n \n class PlatformFrameBufferAllocator : libcamera::Extensible\n@@ -31,7 +32,7 @@ public:\n \t * Note: The returned FrameBuffer needs to be destroyed before\n \t * PlatformFrameBufferAllocator is destroyed.\n \t */\n-\tstd::unique_ptr<libcamera::FrameBuffer> allocate(\n+\tstd::unique_ptr<HALFrameBuffer> allocate(\n \t\tint halPixelFormat, const libcamera::Size &size, uint32_t usage);\n };\n \n@@ -44,7 +45,7 @@ PlatformFrameBufferAllocator::PlatformFrameBufferAllocator(\t\t\\\n PlatformFrameBufferAllocator::~PlatformFrameBufferAllocator()\t\t\\\n {\t\t\t\t\t\t\t\t\t\\\n }\t\t\t\t\t\t\t\t\t\\\n-std::unique_ptr<libcamera::FrameBuffer>\t\t\t\t\t\\\n+std::unique_ptr<HALFrameBuffer>\t\t\t\t\t\t\\\n PlatformFrameBufferAllocator::allocate(int halPixelFormat,\t\t\\\n \t\t\t\t const libcamera::Size &size,\t\\\n \t\t\t\t uint32_t usage)\t\t\t\\\ndiff --git a/src/android/hal_framebuffer.cpp b/src/android/hal_framebuffer.cpp\nnew file mode 100644\nindex 00000000..c154f4b6\n--- /dev/null\n+++ b/src/android/hal_framebuffer.cpp\n@@ -0,0 +1,25 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * hal_framebuffer.cpp - Android Frame Buffer Handling\n+ */\n+\n+#include \"hal_framebuffer.h\"\n+\n+#include <hardware/camera3.h>\n+\n+HALFrameBuffer::HALFrameBuffer(\n+\t\t std::unique_ptr<Private> d,\n+\t\t const std::vector<Plane> &planes,\n+\t\t buffer_handle_t handle)\n+\t\t : FrameBuffer(std::move(d), planes), handle_(handle)\n+{\n+}\n+\n+HALFrameBuffer::HALFrameBuffer(\n+\t\t const std::vector<Plane> &planes,\n+\t\t buffer_handle_t handle)\n+\t\t : FrameBuffer(planes), handle_(handle)\n+{\n+}\ndiff --git a/src/android/hal_framebuffer.h b/src/android/hal_framebuffer.h\nnew file mode 100644\nindex 00000000..33f9e4e0\n--- /dev/null\n+++ b/src/android/hal_framebuffer.h\n@@ -0,0 +1,27 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * hal_framebuffer.h - Android Frame Buffer Handling\n+ */\n+\n+#pragma once\n+\n+#include \"libcamera/internal/framebuffer.h\"\n+\n+#include <hardware/camera3.h>\n+\n+class HALFrameBuffer final : public libcamera::FrameBuffer\n+{\n+public:\n+\tHALFrameBuffer(std::unique_ptr<Private> d,\n+\t\t const std::vector<Plane> &planes,\n+\t\t buffer_handle_t handle);\n+\tHALFrameBuffer(const std::vector<Plane> &planes,\n+\t\t buffer_handle_t handle);\n+\n+\tbuffer_handle_t handle() const { return handle_; }\n+\n+private:\n+\tbuffer_handle_t handle_;\n+};\ndiff --git a/src/android/meson.build b/src/android/meson.build\nindex 75b4bf20..c6790cba 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -38,6 +38,7 @@ endif\n android_deps += [libyuv_dep]\n \n android_hal_sources = files([\n+ 'hal_framebuffer.cpp',\n 'camera3_hal.cpp',\n 'camera_capabilities.cpp',\n 'camera_device.cpp',\ndiff --git a/src/android/mm/cros_frame_buffer_allocator.cpp b/src/android/mm/cros_frame_buffer_allocator.cpp\nindex 52e8c180..bf5a8ae6 100644\n--- a/src/android/mm/cros_frame_buffer_allocator.cpp\n+++ b/src/android/mm/cros_frame_buffer_allocator.cpp\n@@ -16,6 +16,7 @@\n \n #include \"../camera_device.h\"\n #include \"../frame_buffer_allocator.h\"\n+#include \"../hal_framebuffer.h\"\n #include \"cros-camera/camera_buffer_manager.h\"\n \n using namespace libcamera;\n@@ -47,11 +48,11 @@ public:\n \t{\n \t}\n \n-\tstd::unique_ptr<libcamera::FrameBuffer>\n+\tstd::unique_ptr<HALFrameBuffer>\n \tallocate(int halPixelFormat, const libcamera::Size &size, uint32_t usage);\n };\n \n-std::unique_ptr<libcamera::FrameBuffer>\n+std::unique_ptr<HALFrameBuffer>\n PlatformFrameBufferAllocator::Private::allocate(int halPixelFormat,\n \t\t\t\t\t\tconst libcamera::Size &size,\n \t\t\t\t\t\tuint32_t usage)\n@@ -80,9 +81,12 @@ PlatformFrameBufferAllocator::Private::allocate(int halPixelFormat,\n \t\tplane.length = cros::CameraBufferManager::GetPlaneSize(handle, i);\n \t}\n \n-\treturn std::make_unique<FrameBuffer>(\n-\t\tstd::make_unique<CrosFrameBufferData>(std::move(scopedHandle)),\n-\t\tplanes);\n+\tauto fb = std::make_unique<HALFrameBuffer>(\n+\t\t\tstd::make_unique<CrosFrameBufferData>(\n+\t\t\t\tstd::move(scopedHandle)),\n+\t\t\tplanes, handle);\n+\n+\treturn fb;\n }\n \n PUBLIC_FRAME_BUFFER_ALLOCATOR_IMPLEMENTATION\ndiff --git a/src/android/mm/generic_frame_buffer_allocator.cpp b/src/android/mm/generic_frame_buffer_allocator.cpp\nindex acb2fa2b..dd205dfe 100644\n--- a/src/android/mm/generic_frame_buffer_allocator.cpp\n+++ b/src/android/mm/generic_frame_buffer_allocator.cpp\n@@ -20,6 +20,7 @@\n \n #include \"../camera_device.h\"\n #include \"../frame_buffer_allocator.h\"\n+#include \"../hal_framebuffer.h\"\n \n using namespace libcamera;\n \n@@ -77,7 +78,7 @@ public:\n \n \t~Private() override;\n \n-\tstd::unique_ptr<libcamera::FrameBuffer>\n+\tstd::unique_ptr<HALFrameBuffer>\n \tallocate(int halPixelFormat, const libcamera::Size &size, uint32_t usage);\n \n private:\n@@ -92,7 +93,7 @@ PlatformFrameBufferAllocator::Private::~Private()\n \t\tgralloc_close(allocDevice_);\n }\n \n-std::unique_ptr<libcamera::FrameBuffer>\n+std::unique_ptr<HALFrameBuffer>\n PlatformFrameBufferAllocator::Private::allocate(int halPixelFormat,\n \t\t\t\t\t\tconst libcamera::Size &size,\n \t\t\t\t\t\tuint32_t usage)\n@@ -135,9 +136,10 @@ PlatformFrameBufferAllocator::Private::allocate(int halPixelFormat,\n \t\toffset += planeSize;\n \t}\n \n-\treturn std::make_unique<FrameBuffer>(\n-\t\tstd::make_unique<GenericFrameBufferData>(allocDevice_, handle),\n-\t\tplanes);\n+\treturn std::make_unique<HALFrameBuffer>(\n+\t\t\tstd::make_unique<GenericFrameBufferData>(\n+\t\t\t\tallocDevice_, handle),\n+\t\t\tplanes, handle);\n }\n \n PUBLIC_FRAME_BUFFER_ALLOCATOR_IMPLEMENTATION\n", "prefixes": [ "libcamera-devel", "v4", "2/6" ] }