{"id":15720,"url":"https://patchwork.libcamera.org/api/patches/15720/?format=json","web_url":"https://patchwork.libcamera.org/patch/15720/","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":"<20220426091409.1352047-3-chenghaoyang@chromium.org>","date":"2022-04-26T09:14:07","name":"[libcamera-devel,v3,2/4] Add AndroidFrameBuffer and replace FrameBuffer in src/android","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0c5825c53c11979731a346f0eca44f095dc8ea8a","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/15720/mbox/","series":[{"id":3071,"url":"https://patchwork.libcamera.org/api/series/3071/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3071","date":"2022-04-26T09:14:05","name":"Add CrOS JEA implementation","version":3,"mbox":"https://patchwork.libcamera.org/series/3071/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15720/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15720/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 BB299C0F1B\n\tfor ;\n\tTue, 26 Apr 2022 09:16:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 69F8265648;\n\tTue, 26 Apr 2022 11:16:16 +0200 (CEST)","from mail-pl1-x630.google.com (mail-pl1-x630.google.com\n\t[IPv6:2607:f8b0:4864:20::630])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CAE7360431\n\tfor ;\n\tTue, 26 Apr 2022 11:16:14 +0200 (CEST)","by mail-pl1-x630.google.com with SMTP id q8so6470076plx.3\n\tfor ;\n\tTue, 26 Apr 2022 02:16:14 -0700 (PDT)","from chenghaoyang.c.googlers.com.com\n\t(93.135.240.35.bc.googleusercontent.com. [35.240.135.93])\n\tby smtp.gmail.com with ESMTPSA id\n\tw123-20020a623081000000b005056a4d71e3sm14441042pfw.77.2022.04.26.02.16.11\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 26 Apr 2022 02:16:12 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1650964576;\n\tbh=sKwiuYaZ+MuyA5kpHrycmVck9KFSEcBct5hTugdDRJs=;\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=Y1ud+XDtxDlOtbxLzUlhhiZtibyrRaTd72VXnTqG12TwAimetM4alRRaWREgGY5qw\n\txYQWpbNrYq+QmoPdBfom02UIG2x5McdaVRichKiJvlMApgXmXCSi+jOhOyVGs4eYfi\n\t75NquTyIHSraiZHnLegdChmsyM1zx253qRuJ70l4wIdeB9bcv1DuQk97zM0z4/gLeb\n\tv/DvQiFieRG2+2RJbdVWK8ajzKAKLVtSPs6Z74neEzgbhYHvXvbsS0rP7er9pIWlK4\n\t2L7yNP/FAHjVUUnRtXpvzwlLQXjDM7j412/hxU3OEHS+A4gp7oTXsDUOe+k6AN130B\n\tezIc1WL1lO0nw==","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=DVcLjICLzdcchRVeSKDG7Y1ioaGg+EZiZ3KEhXdCJ4Y=;\n\tb=M5xt6IwCN2vUDLbSx3+lHC5kgzYgjMn21uGJAsBKCPQRcli6oi43gsBSgqMCKV1cSx\n\tYGwWislHpjRzuGWI0dQSJdnWkw/5S3E0HkS42yIuVzZUY50uYTdQvfzUcPRpRLoHRLMU\n\teWQxQnN/dT3yLlbabZP6iKKNxt8wXPYCn5J9o="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"M5xt6IwC\"; \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=DVcLjICLzdcchRVeSKDG7Y1ioaGg+EZiZ3KEhXdCJ4Y=;\n\tb=Gqzj3HeVMatvQ2qWorMV6zmU+b74jZSz834VsWj3H/9lUghD60vR/dG9CLAhrm7GZv\n\tr+AtfH/zgvpNfS1hVcfdOe1LH51m+4fIpp4VjuHwjtIYGfyensjlpem8P/IfqQNbW5yv\n\tBx2V6mQuXcLaAgAUErMnTHJ+g3BwkcHxgKcLNVLtr+y69RU+qp78oNWf1rUYCJcQgQsd\n\tfTUPK9budaDk2JIinGbf53QcO6l4ARwc3OckwqOIR09uXUdQqMHua0P9t8AwoRzEZp62\n\teG/2YVfIS1f9a18OfQk/++NrZfII64DHu5dPKF8gKCKqU4NRdOGVbfGG/vjZTUBkM9KJ\n\t9pJA==","X-Gm-Message-State":"AOAM533DTM2wZXfR56uwASEWFpbsGM55ZjwH0HhU5mG+HGR5yoETkIOc\n\tc+dyrqezkDJeoweE4wsXcN86OzgwZ/aLvS8K","X-Google-Smtp-Source":"ABdhPJxl/Imvjb2dRKPhlZ4zRqlol6abO+9bR3iJbnhEjhG/aa8rnCYdnpE1SjeBF+in+YcxjWTn6Q==","X-Received":"by 2002:a17:90a:df0f:b0:1d9:2372:b55e with SMTP id\n\tgp15-20020a17090adf0f00b001d92372b55emr19988295pjb.104.1650964572878; \n\tTue, 26 Apr 2022 02:16:12 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 26 Apr 2022 09:14:07 +0000","Message-Id":"<20220426091409.1352047-3-chenghaoyang@chromium.org>","X-Mailer":"git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog","In-Reply-To":"<20220426091409.1352047-1-chenghaoyang@chromium.org>","References":"<20220426091409.1352047-1-chenghaoyang@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/4] Add AndroidFrameBuffer 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":"AndroidFrameBuffer 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/android_framebuffer.cpp | 32 +++++++++++++++++++\n src/android/android_framebuffer.h | 28 ++++++++++++++++\n src/android/camera_device.cpp | 3 +-\n src/android/frame_buffer_allocator.h | 7 ++--\n src/android/meson.build | 1 +\n .../mm/cros_frame_buffer_allocator.cpp | 13 +++++---\n .../mm/generic_frame_buffer_allocator.cpp | 11 ++++---\n 7 files changed, 81 insertions(+), 14 deletions(-)\n create mode 100644 src/android/android_framebuffer.cpp\n create mode 100644 src/android/android_framebuffer.h","diff":"diff --git a/src/android/android_framebuffer.cpp b/src/android/android_framebuffer.cpp\nnew file mode 100644\nindex 00000000..1ff7018e\n--- /dev/null\n+++ b/src/android/android_framebuffer.cpp\n@@ -0,0 +1,32 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * android_framebuffer.cpp - Android Frame buffer handling\n+ */\n+\n+#include \"android_framebuffer.h\"\n+\n+#include \n+\n+AndroidFrameBuffer::AndroidFrameBuffer(\n+\tbuffer_handle_t handle,\n+\tstd::unique_ptr d,\n+\tconst std::vector &planes,\n+\tunsigned int cookie)\n+\t: FrameBuffer(std::move(d), planes, cookie), handle_(handle)\n+{\n+}\n+\n+AndroidFrameBuffer::AndroidFrameBuffer(\n+\tbuffer_handle_t handle,\n+\tconst std::vector &planes,\n+\tunsigned int cookie)\n+\t: FrameBuffer(planes, cookie), handle_(handle)\n+{\n+}\n+\n+buffer_handle_t AndroidFrameBuffer::getHandle() const\n+{\n+\treturn handle_;\n+}\ndiff --git a/src/android/android_framebuffer.h b/src/android/android_framebuffer.h\nnew file mode 100644\nindex 00000000..49df9756\n--- /dev/null\n+++ b/src/android/android_framebuffer.h\n@@ -0,0 +1,28 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2022, Google Inc.\n+ *\n+ * android_framebuffer.h - Android Frame buffer handling\n+ */\n+\n+#pragma once\n+\n+#include \"libcamera/internal/framebuffer.h\"\n+\n+#include \n+\n+class AndroidFrameBuffer final : public libcamera::FrameBuffer\n+{\n+public:\n+\tAndroidFrameBuffer(\n+\t\tbuffer_handle_t handle, std::unique_ptr d,\n+\t\tconst std::vector &planes,\n+\t\tunsigned int cookie = 0);\n+\tAndroidFrameBuffer(buffer_handle_t handle,\n+\t\t\t const std::vector &planes,\n+\t\t\t unsigned int cookie = 0);\n+\tbuffer_handle_t getHandle() const;\n+\n+private:\n+\tbuffer_handle_t handle_ = nullptr;\n+};\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 00d48471..643b4dee 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -25,6 +25,7 @@\n \n #include \"system/graphics.h\"\n \n+#include \"android_framebuffer.h\"\n #include \"camera_buffer.h\"\n #include \"camera_hal_config.h\"\n #include \"camera_ops.h\"\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(camera3buffer, planes);\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..d7b2118e 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 \"android_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\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/meson.build b/src/android/meson.build\nindex 75b4bf20..27be27bb 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+ 'android_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..163c5d75 100644\n--- a/src/android/mm/cros_frame_buffer_allocator.cpp\n+++ b/src/android/mm/cros_frame_buffer_allocator.cpp\n@@ -14,6 +14,7 @@\n \n #include \"libcamera/internal/framebuffer.h\"\n \n+#include \"../android_framebuffer.h\"\n #include \"../camera_device.h\"\n #include \"../frame_buffer_allocator.h\"\n #include \"cros-camera/camera_buffer_manager.h\"\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,11 @@ 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(handle,\n+\t\t\t\t\t\t std::make_unique(std::move(scopedHandle)),\n+\t\t\t\t\t\t planes);\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..c79b7b10 100644\n--- a/src/android/mm/generic_frame_buffer_allocator.cpp\n+++ b/src/android/mm/generic_frame_buffer_allocator.cpp\n@@ -18,6 +18,7 @@\n #include \n #include \n \n+#include \"../android_framebuffer.h\"\n #include \"../camera_device.h\"\n #include \"../frame_buffer_allocator.h\"\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,9 @@ 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(handle,\n+\t\t\t\t\t\t std::make_unique(allocDevice_, handle),\n+\t\t\t\t\t\t planes);\n }\n \n PUBLIC_FRAME_BUFFER_ALLOCATOR_IMPLEMENTATION\n","prefixes":["libcamera-devel","v3","2/4"]}