{"id":16312,"url":"https://patchwork.libcamera.org/api/patches/16312/?format=json","web_url":"https://patchwork.libcamera.org/patch/16312/","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":"<20220622123706.2946976-3-chenghaoyang@google.com>","date":"2022-06-22T12:37:02","name":"[libcamera-devel,v5,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/16312/mbox/","series":[{"id":3203,"url":"https://patchwork.libcamera.org/api/series/3203/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3203","date":"2022-06-22T12:37:00","name":"Add CrOS JEA implementation","version":5,"mbox":"https://patchwork.libcamera.org/series/3203/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16312/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16312/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 C0AA3BE173\n\tfor ;\n\tWed, 22 Jun 2022 12:37:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 788F26563E;\n\tWed, 22 Jun 2022 14:37:22 +0200 (CEST)","from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com\n\t[IPv6:2607:f8b0:4864:20::52d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9FCAC65633\n\tfor ;\n\tWed, 22 Jun 2022 14:37:21 +0200 (CEST)","by mail-pg1-x52d.google.com with SMTP id a14so6372176pgh.11\n\tfor ;\n\tWed, 22 Jun 2022 05:37:21 -0700 (PDT)","from chenghaoyang-low.c.googlers.com.com\n\t(21.160.199.104.bc.googleusercontent.com. [104.199.160.21])\n\tby smtp.gmail.com with ESMTPSA id\n\tj3-20020a170903024300b0016378bfeb90sm12684038plh.227.2022.06.22.05.37.17\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 22 Jun 2022 05:37:18 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655901442;\n\tbh=LKqALmDt50+5yOyoAHOijoCc6s6vv955mnG7vs8o9T4=;\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=NnWvusB4oNn05ESKOzaNaMLh9+EaGU63aOtPqjzKifYf6DjJq1WkCRBHgxiazBQHf\n\togIdRZ4tNJKrGPr5nVNmZKSUkeEd4yCJXrFgDmcGLuVLeCehLb8T4UjeJ0I6W1oZnt\n\tOsnL/ihcKfzL7RStR3o2QZAH9FobNfs3+thdMi2w/aplRFsOZ2Z/TkZM7vXDE3uGr3\n\tVk1j8ccWGl2aYwwyHWnfonqzR/cgCir4wiURAwQalmc+HWfY9KaRxmi3ISETS5Dr9d\n\tKDTAAjDYV6jWJ2aRvxE6RpaTqOblisDPdRK6mcwdYKxR0vMxv9k3nBThmlcnfzGFl0\n\twwhI6EpRirUaQ==","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=gXmjz/e3JP56CR5DNaPKTCbEaiD+okVXbD7/pqpLWdE=;\n\tb=HmEPdOK7zEIO5B1NsuEhjNXCMCn3YJhsKBwrBzKSfRHCwR9oc/MNoQ0w2L/uFOzTRX\n\tpqAVpTIlhmqOCH14SsE7+3x41ErFalwxznLaQyoZtTC45hKIzpiokY35icJd+azUbi3v\n\tE5nllAhhJ9ieEpUMwwiChWBqmwMNiJsK7zoMc="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"HmEPdOK7\"; \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=gXmjz/e3JP56CR5DNaPKTCbEaiD+okVXbD7/pqpLWdE=;\n\tb=XxmwsNQxDp5zOnrUXYfF49ZMmPpDJIyjDIV5z+/P+Gr2+WAq99q+AkJ1O7CA/iQ+++\n\t4RbsfVUfjGQP2XrnO4LtshqoUNKx9hNjHimw10OwLsB20nwOvKeqUZ3bR1xB3bzJMwUy\n\tYuh957by07FnBOsMrwjTWxbvAGDE4M0faEmKdBm3Rryfyuw1c1T+O4zF0hRdzUrpWhwo\n\tNiMMZYgoIE3oVxo6IzzejtDB4tUR4DnI+1c0R4nmIZ5P70GmV2pyMWihmkuLcZO3twla\n\tVYd9dS32OA43gJyTWNUqhc9J9pUcZccrFBRWVZC2H7LZ98osYLMIQQ0ZGeloMrMPfk2b\n\tzldw==","X-Gm-Message-State":"AJIora+huIHnrtucxlRkawKgxCTgML46IsV0UJ9NFrfdRHi8CjfwxXmC\n\tHngR3CWklLMnkuSjkkbSVFHQDkBv1W2VnQ==","X-Google-Smtp-Source":"AGRyM1vD0LEKimUxAnO4AybVaGX/qQC17zQwG63q4SMZrJ/yd8iGjFST+aEyOU4LEdyusXq8mtG+Gw==","X-Received":"by 2002:aa7:93a5:0:b0:51b:e0f8:97a6 with SMTP id\n\tx5-20020aa793a5000000b0051be0f897a6mr34698673pff.44.1655901439737; \n\tWed, 22 Jun 2022 05:37:19 -0700 (PDT)","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 22 Jun 2022 12:37:02 +0000","Message-Id":"<20220622123706.2946976-3-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.37.0.rc0.104.g0611611a94-goog","In-Reply-To":"<20220622123706.2946976-1-chenghaoyang@google.com>","References":"<20220622123706.2946976-1-chenghaoyang@google.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 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":"","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":"Harvey Yang ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Harvey Yang \n\nAndroidFrameBuffer is derived from FrameBuffer with access to\nbuffer_handle_t, which is needed for JEA usage.\n\nSigned-off-by: Harvey Yang \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(planes);\n+\treturn std::make_unique(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 \n \n #include \n-#include \n #include \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 allocate(\n+\tstd::unique_ptr 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\t\t\t\t\t\\\n+std::unique_ptr \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 \n+\n+HALFrameBuffer::HALFrameBuffer(std::unique_ptr d,\n+\t\t\t const std::vector &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 &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 \n+\n+class HALFrameBuffer final : public libcamera::FrameBuffer\n+{\n+public:\n+\tHALFrameBuffer(std::unique_ptr d,\n+\t\t const std::vector &planes,\n+\t\t buffer_handle_t handle);\n+\tHALFrameBuffer(const std::vector &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\n+\tstd::unique_ptr\n \tallocate(int halPixelFormat, const libcamera::Size &size, uint32_t usage);\n };\n \n-std::unique_ptr\n+std::unique_ptr\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(\n-\t\tstd::make_unique(std::move(scopedHandle)),\n-\t\tplanes);\n+\tauto fb = std::make_unique(\n+\t\t\tstd::make_unique(\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\n+\tstd::unique_ptr\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\n+std::unique_ptr\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(\n-\t\tstd::make_unique(allocDevice_, handle),\n-\t\tplanes);\n+\treturn std::make_unique(\n+\t\t\tstd::make_unique(\n+\t\t\t\tallocDevice_, handle),\n+\t\t\tplanes, handle);\n }\n \n PUBLIC_FRAME_BUFFER_ALLOCATOR_IMPLEMENTATION\n","prefixes":["libcamera-devel","v5","2/6"]}