{"id":18003,"url":"https://patchwork.libcamera.org/api/1.1/patches/18003/?format=json","web_url":"https://patchwork.libcamera.org/patch/18003/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20221214093330.3345421-3-chenghaoyang@google.com>","date":"2022-12-14T09:33:25","name":"[libcamera-devel,v8,2/7] Add HALFrameBuffer and replace FrameBuffer in src/android","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9018dcccc061e88e1206dd44a36fe26f208e0c6e","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/1.1/people/117/?format=json","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18003/mbox/","series":[{"id":3671,"url":"https://patchwork.libcamera.org/api/1.1/series/3671/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3671","date":"2022-12-14T09:33:23","name":"Add CrOS JEA implementation","version":8,"mbox":"https://patchwork.libcamera.org/series/3671/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18003/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18003/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 A74DDBDE6B\n\tfor ;\n\tWed, 14 Dec 2022 09:33:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7423A63367;\n\tWed, 14 Dec 2022 10:33:41 +0100 (CET)","from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com\n\t[IPv6:2607:f8b0:4864:20::42d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0FA6D63367\n\tfor ;\n\tWed, 14 Dec 2022 10:33:38 +0100 (CET)","by mail-pf1-x42d.google.com with SMTP id 130so4024219pfu.8\n\tfor ;\n\tWed, 14 Dec 2022 01:33:38 -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\td206-20020a621dd7000000b0056bc742d21esm9331190pfd.176.2022.12.14.01.33.36\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 14 Dec 2022 01:33:36 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1671010421;\n\tbh=DGi6PuSstSVfzpmRnRFuZWB86tH5N6NJp7oG94I0rY8=;\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=QRuFQboqC2z+/uWbeDu6gu2EWSZAmW4BmUE0oD+Rk/Wv8OG5ImqSKXlIh544gcS/q\n\tdyJWjgTAlCusUxRG5LmWV84u1BfA0XoRj9/iq6RKfbuQaGql+ra2BKf1QkFVwl9i+Y\n\tsQSyBrC+ZSTfi3cVXcSOfKJiMJy+qcBCgkE3IPhvbUmAA+Qv5G7MVC2iG0SjhHTNrt\n\txpgteKH8Qak8Rod/LxRpNMRhW9gT2asSz/N0Wm3sr7EU+BGj2tTNhVdsDZt0NIzF7H\n\tvchxXY5OtDmcpFS44U3pEw7lD3F7emzCwNEpBphDUPRASktiNQb3bu1wKo/pA0zdj/\n\tgqzoPuNVKGzKg==","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=fzh1/Ppfkgy0Yvbez+hwcKyVUiBY1M1Y2HudhCkjaKs=;\n\tb=T/KXaxPHeyU9IL5h/Qvq3XVSV8TMy9Ae+7Tben+V9JAgm4dBQJ70s8RIWyfxZDkp7D\n\tw0MlVPhoE+MLuIYw+soOnGMkVLg02QXRFxefgPDXeztD6rqIzXlzy8F+NVlbJ10OkM7z\n\td+KN1UZbUHmJNpdJzxJUxXhCQ2HpdwPiNNqlc="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"T/KXaxPH\"; \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=fzh1/Ppfkgy0Yvbez+hwcKyVUiBY1M1Y2HudhCkjaKs=;\n\tb=zjVW51R5m56nw/kST8fPHNlTRw7ydld/NsjwU2FNRc1P2RrkUfPpj5Fz7R57SbqHkn\n\tiJN5S5/o4MQrRXGJPQj5PtIQx4g8oVkwN7pqZin1G4xthpEkcNqKHbhdwynFL0lCJKYj\n\t3HYfgwQEtRd0wrFGj4onw9AJiZaIjMbskX4TP59AHMIkpGG11DFPUJbJLKfe80CCL6lY\n\tuyTGDrAyGMRF1FPM2qnVyYNvFRMXkdewuH6I8oySnfrILH0REk28v7iKXmicjKMHJR/b\n\tHxmiC0wiSxKT0aDeFEEzOh1naff1fwEYxgoWzlFhns4kOcTrCmNqY55MQZC6mZF8H/Hj\n\tjZTQ==","X-Gm-Message-State":"ANoB5plsxWV9KQqtNBPcyzoj0lGlwiFzbFaK5PnCOxoJK641PkTLMaph\n\tLAGTS1zwbQJpM6UGBXB5p1PWIcfgNb3l/63n","X-Google-Smtp-Source":"AA0mqf7IBlVxn9apdbQxJ61uvYXDpUTJn2vmO6RFvd9tUgKq8jJn2fCySXaimXmGQeSIz0EhCq5nxQ==","X-Received":"by 2002:a62:87cc:0:b0:576:dc40:6db9 with SMTP id\n\ti195-20020a6287cc000000b00576dc406db9mr24620554pfe.13.1671010417125; \n\tWed, 14 Dec 2022 01:33:37 -0800 (PST)","X-Google-Original-From":"Harvey Yang ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 14 Dec 2022 09:33:25 +0000","Message-Id":"<20221214093330.3345421-3-chenghaoyang@google.com>","X-Mailer":"git-send-email 2.39.0.rc1.256.g54fd8350bd-goog","In-Reply-To":"<20221214093330.3345421-1-chenghaoyang@google.com>","References":"<20221214093330.3345421-1-chenghaoyang@google.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v8 2/7] 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\nHALFrameBuffer is derived from FrameBuffer with access to\nbuffer_handle_t, which is needed for JEA usage.\n\nSigned-off-by: Harvey Yang \nReviewed-by: Laurent Pinchart \nReviewed-by: Han-Lin Chen \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 b20e389b..1f7ce440 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\n+std::unique_ptr\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(planes);\n+\treturn std::make_unique(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 64050416..43ee0159 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\n+\tstd::unique_ptr\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 37b6ae32..20aba79d 100644\n--- a/src/android/camera_request.h\n+++ b/src/android/camera_request.h\n@@ -21,6 +21,7 @@\n #include \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 frameBuffer;\n+\t\tstd::unique_ptr 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 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..3f3d1ed1\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 \n+\n+HALFrameBuffer::HALFrameBuffer(std::unique_ptr 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 &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..dc96a7e1\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 \n+\n+class HALFrameBuffer final : public libcamera::FrameBuffer\n+{\n+public:\n+\tHALFrameBuffer(std::unique_ptr d,\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 1bba54de..b543c143 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 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\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@@ -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(\n-\t\tstd::make_unique(std::move(scopedHandle), planes));\n+\treturn std::make_unique(\n+\t\tstd::make_unique(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\n+\tstd::unique_ptr\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\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@@ -137,8 +138,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, planes));\n+\treturn std::make_unique(\n+\t\tstd::make_unique(\n+\t\t\tallocDevice_, handle, planes),\n+\t\thandle);\n }\n \n PUBLIC_FRAME_BUFFER_ALLOCATOR_IMPLEMENTATION\n","prefixes":["libcamera-devel","v8","2/7"]}