Patch Detail
Show a patch.
GET /api/1.1/patches/18119/?format=api
{ "id": 18119, "url": "https://patchwork.libcamera.org/api/1.1/patches/18119/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18119/", "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": "<20230116002808.16014-3-laurent.pinchart@ideasonboard.com>", "date": "2023-01-16T00:28:02", "name": "[libcamera-devel,v9,2/8] android: framebuffer: Add HALFrameBuffer and replace FrameBuffer", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9018dcccc061e88e1206dd44a36fe26f208e0c6e", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18119/mbox/", "series": [ { "id": 3712, "url": "https://patchwork.libcamera.org/api/1.1/series/3712/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3712", "date": "2023-01-16T00:28:00", "name": "Add CrOS JEA implementation", "version": 9, "mbox": "https://patchwork.libcamera.org/series/3712/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18119/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18119/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 F377DC3294\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 16 Jan 2023 00:28:13 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 52788625E8;\n\tMon, 16 Jan 2023 01:28:13 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A5203625E3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 16 Jan 2023 01:28:11 +0100 (CET)", "from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi\n\t[213.243.189.158])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2F1CA9B4;\n\tMon, 16 Jan 2023 01:28:11 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1673828893;\n\tbh=0dx1q0gSpebx1lZUR61mTZQQw6qIJ4BYIy3cdVECx60=;\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=qgADqPnLp2dY4vMMga2aZtJHl3jXn9LUziKP9fgGkLEKHZ9ZnwSSFn4SSUywqBNNC\n\tRNSuhPrQc5XlEfO8/0AXglSFJc9c3sSH4wYWFriQwag/eFgGyV+qmnLp/s/pwu/AWi\n\tl7EccIdFTudtoJeJPMz4QUe1K/Pi0w5xUQs0QJliRm27+skzEQDB/o1KHHSTa+kKHv\n\t+4inDjlRSe/LIJHAnaNnnzcVbNLRUE8Kea398yAQO4AOnmjm+mQZIaB2WN2Qj3Oq4f\n\tEhr7o/XwQBvJwOUgHNZ/BbG+GKCLLfW0gHrE9r8dE7ZjEIZ/ACM2hhUVd0kq31FUjp\n\totd5dkWj79pKw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1673828891;\n\tbh=0dx1q0gSpebx1lZUR61mTZQQw6qIJ4BYIy3cdVECx60=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=UTthdIrgRO0jcSXEr6zKazOmkBkZENZkkq4zPDgN0QKaA/zdt3f4wHLq9Os2x/FOJ\n\tJyLU68TQgckB2G/GDGZhKptRBva4v++0GZTSBl97BzRlCOLWo9dFsvbZaYqA/gzc94\n\tFDnClmY9VQAMM02hQA6aklPAZtS+T1PMdfv+kgpc=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"UTthdIrg\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 16 Jan 2023 02:28:02 +0200", "Message-Id": "<20230116002808.16014-3-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.38.2", "In-Reply-To": "<20230116002808.16014-1-laurent.pinchart@ideasonboard.com>", "References": "<20230116002808.16014-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v9 2/8] android: framebuffer: Add\n\tHALFrameBuffer and replace FrameBuffer", "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": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Cc": "Harvey Yang <chenghaoyang@chromium.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Harvey Yang <chenghaoyang@chromium.org>\n\nHALFrameBuffer 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>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Han-Lin Chen <hanlinchen@chromium.org>\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/android/camera_device.cpp | 5 ++--\n src/android/camera_device.h | 3 ++-\n src/android/camera_request.h | 3 ++-\n src/android/frame_buffer_allocator.h | 7 ++---\n src/android/hal_framebuffer.cpp | 22 ++++++++++++++++\n src/android/hal_framebuffer.h | 26 +++++++++++++++++++\n src/android/meson.build | 1 +\n .../mm/cros_frame_buffer_allocator.cpp | 9 ++++---\n .../mm/generic_frame_buffer_allocator.cpp | 11 +++++---\n 9 files changed, 72 insertions(+), 15 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 b20e389b9d30..1f7ce4402b63 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -30,6 +30,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@@ -771,7 +772,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \treturn 0;\n }\n \n-std::unique_ptr<FrameBuffer>\n+std::unique_ptr<HALFrameBuffer>\n CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer,\n \t\t\t\tPixelFormat pixelFormat, const Size &size)\n {\n@@ -794,7 +795,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/camera_device.h b/src/android/camera_device.h\nindex 64050416e67e..43ee01592e77 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -29,6 +29,7 @@\n #include \"camera_capabilities.h\"\n #include \"camera_metadata.h\"\n #include \"camera_stream.h\"\n+#include \"hal_framebuffer.h\"\n #include \"jpeg/encoder.h\"\n \n class Camera3RequestDescriptor;\n@@ -83,7 +84,7 @@ private:\n \n \tvoid stop() LIBCAMERA_TSA_EXCLUDES(stateMutex_);\n \n-\tstd::unique_ptr<libcamera::FrameBuffer>\n+\tstd::unique_ptr<HALFrameBuffer>\n \tcreateFrameBuffer(const buffer_handle_t camera3buffer,\n \t\t\t libcamera::PixelFormat pixelFormat,\n \t\t\t const libcamera::Size &size);\ndiff --git a/src/android/camera_request.h b/src/android/camera_request.h\nindex 37b6ae326f3e..20aba79d5057 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -21,6 +21,7 @@\n #include <hardware/camera3.h>\n \n #include \"camera_metadata.h\"\n+#include \"hal_framebuffer.h\"\n \n class CameraBuffer;\n class CameraStream;\n@@ -44,7 +45,7 @@ public:\n \n \t\tCameraStream *stream;\n \t\tbuffer_handle_t *camera3Buffer;\n-\t\tstd::unique_ptr<libcamera::FrameBuffer> frameBuffer;\n+\t\tstd::unique_ptr<HALFrameBuffer> frameBuffer;\n \t\tlibcamera::UniqueFD fence;\n \t\tStatus status = Status::Success;\n \t\tlibcamera::FrameBuffer *internalBuffer = nullptr;\ndiff --git a/src/android/frame_buffer_allocator.h b/src/android/frame_buffer_allocator.h\nindex 5d2eeda17fc5..e5c9492279d3 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\\\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 000000000000..3f3d1ed1c327\n--- /dev/null\n+++ b/src/android/hal_framebuffer.cpp\n@@ -0,0 +1,22 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * hal_framebuffer.cpp - HAL Frame Buffer Handling\n+ */\n+\n+#include \"hal_framebuffer.h\"\n+\n+#include <hardware/camera3.h>\n+\n+HALFrameBuffer::HALFrameBuffer(std::unique_ptr<Private> d,\n+\t\t\t buffer_handle_t handle)\n+\t: FrameBuffer(std::move(d)), handle_(handle)\n+{\n+}\n+\n+HALFrameBuffer::HALFrameBuffer(const std::vector<Plane> &planes,\n+\t\t\t buffer_handle_t handle)\n+\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 000000000000..dc96a7e193da\n--- /dev/null\n+++ b/src/android/hal_framebuffer.h\n@@ -0,0 +1,26 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * hal_framebuffer.h - HAL 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 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 1bba54de07a8..b543c14371aa 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -46,6 +46,7 @@ android_hal_sources = files([\n 'camera_ops.cpp',\n 'camera_request.cpp',\n 'camera_stream.cpp',\n+ 'hal_framebuffer.cpp',\n 'jpeg/encoder_libjpeg.cpp',\n 'jpeg/exif.cpp',\n 'jpeg/post_processor_jpeg.cpp',\ndiff --git a/src/android/mm/cros_frame_buffer_allocator.cpp b/src/android/mm/cros_frame_buffer_allocator.cpp\nindex 0665c77b1377..0a5c59f2a697 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@@ -48,11 +49,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@@ -81,8 +82,8 @@ 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), planes));\n+\treturn std::make_unique<HALFrameBuffer>(\n+\t\tstd::make_unique<CrosFrameBufferData>(std::move(scopedHandle), planes), handle);\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 956623df1f80..3750e1bf52a9 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@@ -79,7 +80,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@@ -94,7 +95,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@@ -137,8 +138,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, planes));\n+\treturn std::make_unique<HALFrameBuffer>(\n+\t\tstd::make_unique<GenericFrameBufferData>(\n+\t\t\tallocDevice_, handle, planes),\n+\t\thandle);\n }\n \n PUBLIC_FRAME_BUFFER_ALLOCATOR_IMPLEMENTATION\n", "prefixes": [ "libcamera-devel", "v9", "2/8" ] }