{"id":16649,"url":"https://patchwork.libcamera.org/api/patches/16649/?format=json","web_url":"https://patchwork.libcamera.org/patch/16649/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220715143822.672321-3-chenghaoyang@google.com>","date":"2022-07-15T14:38:18","name":"[libcamera-devel,v6,2/6] Add HALFrameBuffer and replace FrameBuffer in src/android","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2228cae6deac810eb0d83d0b4735ca16639f27a4","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16649/mbox/","series":[{"id":3290,"url":"https://patchwork.libcamera.org/api/series/3290/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3290","date":"2022-07-15T14:38:16","name":"Add CrOS JEA implementation","version":6,"mbox":"https://patchwork.libcamera.org/series/3290/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16649/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16649/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 F2537BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 15 Jul 2022 14:38:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 355A86330A;\n\tFri, 15 Jul 2022 16:38:34 +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 A29E16330E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Jul 2022 16:38:32 +0200 (CEST)","by mail-pj1-x1031.google.com with SMTP id\n\to31-20020a17090a0a2200b001ef7bd037bbso6330312pjo.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Jul 2022 07:38:32 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(208.158.221.35.bc.googleusercontent.com. [35.221.158.208])\n\tby smtp.gmail.com with ESMTPSA id\n\tf15-20020aa7968f000000b00528c22fbb45sm3972782pfk.141.2022.07.15.07.38.29\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 15 Jul 2022 07:38:30 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1657895914;\n\tbh=Q+41rMk7T3BPQTQvEk44SVZPvQYv1BAV5oka8Nhw+SY=;\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=Z5gHjzU0xw2y/lwFmZwplDbYxVXFek+286p2iDWl8g6DfDRoQk53WEIed4r0JzBZH\n\t4EkRHeKywwdPYCy4HDtt9YWVNOj9t92UAmrn+0BrxeOUeihA954YVNjZ8HbOID33A2\n\t5fMY5cKqG3ZAm8u4chvx4YrzcltS4ptrG4KBiPGqnEEv6tLtoF+QMX6MssXG5j8EcA\n\tWIUnvHpBwJDfjS+D2P+cYGP/TNHU0sjMRkMRWnRapwwlCF6SwV8DeqScPM6EhKdOHG\n\t3Hr+GD0m6Ohxdbw/nPalhKNcXSrBtqdCHPxA64xYVWPZiolU4r71wXhj0MCGq8RE/J\n\tgMB8CkXQR3QiA==","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=Iy1ely/RL4WS1+NMPV2x/SpEDy7WLYF/BuzpSB9JZ/Q=;\n\tb=II0dfq6niwymsoW2ja9Sm40K+3RdSYu+uzj9DfSMgdosRXH6e4XOWiQK7gRZvwxJew\n\tvpJa0LTLfnJS0JBnBoqr5HNFsz80VHCC1rDVZ71SBAZP8kacEh/wkPgktaiAAg1rjlYy\n\t/sGXzlxUWqCX8T++AjKMDYXb8CaesBIIlTY08="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"II0dfq6n\"; \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=Iy1ely/RL4WS1+NMPV2x/SpEDy7WLYF/BuzpSB9JZ/Q=;\n\tb=5QaHaZO9A9r/lEh0R8K/mExw8hZW2q87Ci4CbdQJFWOwXLVw8yo9gioOG6tWoFBKf7\n\tIDcvWTzLHSQZUYhlGTgqaDO1Vl0xrbl47SUnsG+YaAulEBjYYchAa6D3AW+W/if8u3WH\n\trq8iQOKxSjfOxDfAzSVMXXysdrE/b1+cU+z6rXRhXNzWpT9V9FXKGYrc72wDo32hYtyB\n\tGYkPCEtsWcxS5MdM7M6qbhEfhY+MY44X6H2UvbWBsCAo+5H8b7gLxQ/EoSYm20xlEROw\n\tSbqBs5B18Yl+vYEgvqfYOZSywvU7v9iZkHkn+f9x1kQVqiuB5y5RDUy5wX+J+ncUQeaV\n\tQomA==","X-Gm-Message-State":"AJIora9YDyNS0fpmbR8MQWDGtaYmuMMOsytrC9B2A6FQkgAhaqGhvKjD\n\tmb1pjT4HRGBS/8JDDGpJGCM0yNwU7q1eOQ==","X-Google-Smtp-Source":"AGRyM1tVRTtlsg/6LmayuJVbeli9tRcDwS7An4WrDkfILdYhu4Zkw6C+84oPYYXimzGubXvMTYqvng==","X-Received":"by 2002:a17:903:234d:b0:16c:3e90:12f5 with SMTP id\n\tc13-20020a170903234d00b0016c3e9012f5mr13596557plh.82.1657895910714; \n\tFri, 15 Jul 2022 07:38:30 -0700 (PDT)","X-Google-Original-From":"Harvey Yang <chenghaoyang@google.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 15 Jul 2022 14:38:18 +0000","Message-Id":"<20220715143822.672321-3-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.37.0.170.g444d1eabd0-goog","In-Reply-To":"<20220715143822.672321-1-chenghaoyang@google.com>","References":"<20220715143822.672321-1-chenghaoyang@google.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 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               | 23 ++++++++++++++++\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, 73 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..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..196c3190\n--- /dev/null\n+++ b/src/android/hal_framebuffer.cpp\n@@ -0,0 +1,23 @@\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       const std::vector<Plane> &planes,\n+\t\t\t       buffer_handle_t handle)\n+\t: FrameBuffer(std::move(d), planes), 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..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","v6","2/6"]}