Patch Detail
Show a patch.
GET /api/1.1/patches/17924/?format=api
{ "id": 17924, "url": "https://patchwork.libcamera.org/api/1.1/patches/17924/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17924/", "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": "<20221201092733.2042078-3-chenghaoyang@google.com>", "date": "2022-12-01T09:27:29", "name": "[libcamera-devel,v7,2/6] Add HALFrameBuffer and replace FrameBuffer in src/android", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "944702c0abd8cfd5b8d914984c43e4c08230a0ee", "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/17924/mbox/", "series": [ { "id": 3652, "url": "https://patchwork.libcamera.org/api/1.1/series/3652/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3652", "date": "2022-12-01T09:27:27", "name": "Add CrOS JEA implementation", "version": 7, "mbox": "https://patchwork.libcamera.org/series/3652/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17924/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17924/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 23E0FC3284\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 1 Dec 2022 09:27:48 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 67AD26333E;\n\tThu, 1 Dec 2022 10:27:47 +0100 (CET)", "from mail-pf1-x431.google.com (mail-pf1-x431.google.com\n\t[IPv6:2607:f8b0:4864:20::431])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A071063335\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 1 Dec 2022 10:27:45 +0100 (CET)", "by mail-pf1-x431.google.com with SMTP id l127so683442pfl.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 01 Dec 2022 01:27:45 -0800 (PST)", "from chenghaoyang-low.c.googlers.com.com\n\t(46.165.189.35.bc.googleusercontent.com. [35.189.165.46])\n\tby smtp.gmail.com with ESMTPSA id\n\tz9-20020a1709027e8900b00186b8752a78sm3108050pla.80.2022.12.01.01.27.42\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 01 Dec 2022 01:27:43 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1669886867;\n\tbh=yBofSPsRWhqy1SHwJL6wRgxHfkNtSapeoFSfzmk7Vhc=;\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=CQpz6r42u57EYpNwZJMQL6rgchGGMxvQlaCE+bLMEibwii+lRQNseGtB9GdfTp3D4\n\tY85DgV7Y0+fCq3sK+kVqJ53cG/NNcde4rhJg+Vfrixq0Am0Ia4N++Qe9+QxpofN5FC\n\te4L2bt34n0LDLNJQ/E8ESjpVbosMhsHy7QeQzQ+8YeXP4rMyiqcDUVCgn5HdAomiUt\n\tUt/qqPg28YroKKdw9WBFpPRJAfEsMycj47ahAMBhf9JMSu+V9ki2H4vFFHzreg2xbA\n\tr2zkm2CUR5DhgOZ+SoEvQdvRcccdN5DwT+NaBXQ4dnHhlzO6w5jqkW4ziGPWm98bqJ\n\trt4TnWjLng6PA==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \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=2WIVjXf7T7zWWY8SH7R+GpLPzdRSVC2JpAFQv8b5zVI=;\n\tb=XQeqZILbGCM+Qr6KmEk3XILbr1nV7Lrym2wr265Wyff2Dj3ry6VA8S6lW1MZY6VmT2\n\tdHqFIX/R9xKEt0cPWEJ8jW7dUbkWuGQhtNXvD4Zg6tdg/KQ2W94W3THs/psQdBl7NY1R\n\t7gHXVlE+iTaGsUxWMEs9qWHsq/IKK6PN323go=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"XQeqZILb\"; \n\tdkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\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=2WIVjXf7T7zWWY8SH7R+GpLPzdRSVC2JpAFQv8b5zVI=;\n\tb=vdEkNXGptJHi76m/ZKs0relaOzvS7GKAzkYDu6LsajJR4JaiqdfjRQPVlBpDOSJSw+\n\t7lT9hXjKY5XFKNgRFEvZ/ypCrd0U/RiGEZF5NPuU35YklXCJXrExSj5HbP7D9ojX9t5g\n\tvEoumZrwqsuQltNf/c+eoJL5YEms82zB9SWgHG6zgyuHguuUInUD9Q27bod1FCjO2pmF\n\tUKppqrY/++CUQJZ8Bhhi4pTt3hmmwwJCTP5wHiBSQ2SJ+CeYv+zaneW4/KGG1ZrfDXB4\n\tZ1LYJSix156VLEu1Wq9pNaBo+QswVbLAlWeGIKtE1PQ1i8rbRTqCGnkb9oQWJ76DeoD+\n\t3LbQ==", "X-Gm-Message-State": "ANoB5pmAElrDfFUK4leF/2jCAF90jBr9ckcI7cqME8HEEBNhEPFtl5Cs\n\tNYWXJB4iVIOSdsqomiwbTDFIKCuBDmwNR8Uf", "X-Google-Smtp-Source": "AA0mqf48xgkM9+cCpBBEeEOpHAHx0/Z8jtr5m5SjLrEVSx2PUYGRHs1ikrj8F5krW2dslr6+kmeHyQ==", "X-Received": "by 2002:a65:4c42:0:b0:477:f872:8b6 with SMTP id\n\tl2-20020a654c42000000b00477f87208b6mr23000323pgr.457.1669886863555; \n\tThu, 01 Dec 2022 01:27:43 -0800 (PST)", "X-Google-Original-From": "Harvey Yang <chenghaoyang@google.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 1 Dec 2022 09:27:29 +0000", "Message-Id": "<20221201092733.2042078-3-chenghaoyang@google.com>", "X-Mailer": "git-send-email 2.38.1.584.g0f3c55d4c2-goog", "In-Reply-To": "<20221201092733.2042078-1-chenghaoyang@google.com>", "References": "<20221201092733.2042078-1-chenghaoyang@google.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v7 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": "From: Harvey Yang <chenghaoyang@chromium.org>\n\nAndroidFrameBuffer 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 | 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 7 files changed, 67 insertions(+), 12 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 b20e389b..872161ba 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@@ -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/frame_buffer_allocator.h b/src/android/frame_buffer_allocator.h\nindex 5d2eeda1..e5c94922 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 00000000..4ac5a820\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 - Android 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 00000000..ec737e70\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 - 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 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 1bba54de..c2773f9e 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -37,6 +37,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 0665c77b..0a5c59f2 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 956623df..3750e1bf 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", "v7", "2/6" ] }