From patchwork Tue Sep 12 09:36:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattijs Korpershoek X-Patchwork-Id: 18988 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 9E1C2C32B2 for ; Tue, 12 Sep 2023 09:36:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0E891628F3; Tue, 12 Sep 2023 11:36:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1694511385; bh=IvrwO4X8OhwwBanp8/xv9uVqcURnEWKjBFJLEhmQ/08=; h=Date:References:In-Reply-To:To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=a6P64C35cKVxCv2ORRbHWpEOhqyutnZ3sg0Pl4IpgfmVBLV0LoyfclTjD1i7mg19Z PASSqsWwr9lhJyZvAMn7humvoVxpTqHB9pZ6KcOCLag9Qs+tRqZhflR6WAjPr11jZs 7JJBGA/ZHSQeXKzdKvINjaHQTRQM8TGqHFtmj3ulTDdwqD8dMcN85w+8wEf/pjbkNJ vrw9IBuoyB3PEvA/QZfCOOkW/8PWXH9/mwsidrqpHrZDSIOWN1sjYbguWw8ReEH6Zy btINewUwjlkEdWt/z2jytj6impYiOr/fRmk11Jx8DXUW6gVrexyShYxuTYto3+SIpe JlM9WyvBATJmA== Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E2CA4628E9 for ; Tue, 12 Sep 2023 11:36:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="Gzg5zL7J"; dkim-atps=neutral Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-401d10e3e54so58665735e9.2 for ; Tue, 12 Sep 2023 02:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694511381; x=1695116181; darn=lists.libcamera.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=TL7NM1hWUBHdqI96CSO+Pt6HsQq7zw2HF+zyFI8s/0Q=; b=Gzg5zL7JEQGmsQIIplJv+uvz/QP37k4DjuoTjs6w5HbxqAk+X7FKUsOI+xkedHZXuk C5Igr9ETO0omgzo0rLeVNPM6I0LFEVQnS/UwdKylWtIkHaHyRmfBIGo1nNM4RKBktHoj ZUxm93yK7sB5MEVvuHJmcxFgFBOT0zdRYuzzYU3FPF5yduQ/onaPelLm30e3s2Bdq7BU q67ntywmF6tS4xOUaKAP7wyH3k4ItgbUvriap1PzzHUurq9/ypIMeJnofaGFCaxBNoBQ yqAhHfCwqRoW43GmFIYvXkNqDJq5io5Ha21Rnc7Ne/3Lv5qUpsIbdMO152ZSYSRetTMp F3XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694511381; x=1695116181; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TL7NM1hWUBHdqI96CSO+Pt6HsQq7zw2HF+zyFI8s/0Q=; b=dOAi4Me8Lc/3EfJyMsE49r5EZGNR1Si1Xe2ROn8NOpSN/UKVdzibYhsZ5e+5n6J5LE 0/JN15y2uMi3bkGOza8nj7htvq8KDFkp89W/eUTPTnB6ZMpA3m+zT3HjusOTSTHgkAwW 1pfapWkQPNPJb7smb5Q1L0OgUdsEFaPwKP7iGxZncgmKYKoQe+j0MLeZBQnUl4yw81iw csIxtd6/ex+YQLomEk/KcXddNI8pNsX3oWYoqBrFaH9XnIfJlAOglrQR6lzHjE6PhxOX xL53V8zknJ1NWH3tkV6pQv/FPaPWylScIi55RexO0mBQJuB0G0W6QHxNFts2J6hndS0p fb/Q== X-Gm-Message-State: AOJu0YyctqUmG6VGMk6281cSfXOsO14jq2BN40fgLtbsd8tysYAHcw61 l/GG978qXdj92tAhuDXRW+E2z0uaKA9KdBBGsfQ= X-Google-Smtp-Source: AGHT+IEayMRM2B6/PzAW8ain3P7K15oU4PK6db3MHiigRckU7wzWRand3pzLe5rWo/SFHtMrQfdpFw== X-Received: by 2002:a05:600c:245:b0:3fb:e2af:49f6 with SMTP id 5-20020a05600c024500b003fbe2af49f6mr10369367wmj.39.1694511381266; Tue, 12 Sep 2023 02:36:21 -0700 (PDT) Received: from [192.168.2.39] ([82.66.159.240]) by smtp.gmail.com with ESMTPSA id y10-20020a05600c364a00b00401b242e2e6sm15578253wmq.47.2023.09.12.02.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 02:36:20 -0700 (PDT) Date: Tue, 12 Sep 2023 11:36:13 +0200 MIME-Version: 1.0 Message-Id: <20230912-gralloc-api-v4-v1-4-0f80402d8e7a@baylibre.com> References: <20230912-gralloc-api-v4-v1-0-0f80402d8e7a@baylibre.com> In-Reply-To: <20230912-gralloc-api-v4-v1-0-0f80402d8e7a@baylibre.com> To: libcamera-devel@lists.libcamera.org X-Mailer: b4 0.12.3 Subject: [libcamera-devel] [PATCH 4/4] android: mm: generic: Use GraphicBufferAllocator instead of gralloc.h X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mattijs Korpershoek via libcamera-devel From: Mattijs Korpershoek Reply-To: Mattijs Korpershoek Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" gralloc.h is a very old API that has been deprecated at least since Android P (9). Switch over to a higher level abstraction of gralloc from libui, which is compatible with Android 11 and up. Libui: * is provided in the VNDK (so it's available to vendors). * is also used in the camera vts test named VtsAidlHalCameraProvider_TargetTest. Drop the libhardware stub since we no longer need it. Note: GraphicsBufferAllocator being a Singleton, buffer lifecycle management is easier. Signed-off-by: Mattijs Korpershoek --- src/android/mm/generic_frame_buffer_allocator.cpp | 58 +++++++---------------- src/android/mm/libhardware_stub.c | 17 ------- src/android/mm/meson.build | 8 ++-- 3 files changed, 20 insertions(+), 63 deletions(-) diff --git a/src/android/mm/generic_frame_buffer_allocator.cpp b/src/android/mm/generic_frame_buffer_allocator.cpp index 7ecef2c669df..43e1539aac89 100644 --- a/src/android/mm/generic_frame_buffer_allocator.cpp +++ b/src/android/mm/generic_frame_buffer_allocator.cpp @@ -16,8 +16,8 @@ #include "libcamera/internal/framebuffer.h" #include -#include -#include +#include +#include #include "../camera_device.h" #include "../frame_buffer_allocator.h" @@ -33,35 +33,28 @@ class GenericFrameBufferData : public FrameBuffer::Private LIBCAMERA_DECLARE_PUBLIC(FrameBuffer) public: - GenericFrameBufferData(struct alloc_device_t *allocDevice, + GenericFrameBufferData(android::GraphicBufferAllocator &allocDevice, buffer_handle_t handle, const std::vector &planes) : FrameBuffer::Private(planes), allocDevice_(allocDevice), handle_(handle) { - ASSERT(allocDevice_); ASSERT(handle_); } ~GenericFrameBufferData() override { /* - * allocDevice_ is used to destroy handle_. allocDevice_ is - * owned by PlatformFrameBufferAllocator::Private. - * GenericFrameBufferData must be destroyed before it is - * destroyed. - * - * \todo Consider managing alloc_device_t with std::shared_ptr - * if this is difficult to maintain. - * * \todo Thread safety against alloc_device_t is not documented. * Is it no problem to call alloc/free in parallel? */ - allocDevice_->free(allocDevice_, handle_); + android::status_t status = allocDevice_.free(handle_); + if (status != android::NO_ERROR) + LOG(HAL, Error) << "Error freeing framebuffer: " << status; } private: - struct alloc_device_t *allocDevice_; + android::GraphicBufferAllocator &allocDevice_; const buffer_handle_t handle_; }; } /* namespace */ @@ -73,50 +66,33 @@ class PlatformFrameBufferAllocator::Private : public Extensible::Private public: Private(CameraDevice *const cameraDevice) : cameraDevice_(cameraDevice), - hardwareModule_(nullptr), - allocDevice_(nullptr) + allocDevice_(android::GraphicBufferAllocator::get()) { - hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &hardwareModule_); - ASSERT(hardwareModule_); } - ~Private() override; + ~Private() = default; std::unique_ptr allocate(int halPixelFormat, const libcamera::Size &size, uint32_t usage); private: const CameraDevice *const cameraDevice_; - const struct hw_module_t *hardwareModule_; - struct alloc_device_t *allocDevice_; + android::GraphicBufferAllocator &allocDevice_; }; -PlatformFrameBufferAllocator::Private::~Private() -{ - if (allocDevice_) - gralloc_close(allocDevice_); - dlclose(hardwareModule_->dso); -} - std::unique_ptr PlatformFrameBufferAllocator::Private::allocate(int halPixelFormat, const libcamera::Size &size, uint32_t usage) { - if (!allocDevice_) { - int ret = gralloc_open(hardwareModule_, &allocDevice_); - if (ret) { - LOG(HAL, Fatal) << "gralloc_open() failed: " << ret; - return nullptr; - } - } - - int stride = 0; + uint32_t stride = 0; buffer_handle_t handle = nullptr; - int ret = allocDevice_->alloc(allocDevice_, size.width, size.height, - halPixelFormat, usage, &handle, &stride); - if (ret) { - LOG(HAL, Error) << "failed buffer allocation: " << ret; + + android::status_t status = allocDevice_.allocate(size.width, size.height, halPixelFormat, + 1 /*layerCount*/, usage, &handle, &stride, + "libcameraHAL"); + if (status != android::NO_ERROR) { + LOG(HAL, Error) << "failed buffer allocation: " << status; return nullptr; } if (!handle) { diff --git a/src/android/mm/libhardware_stub.c b/src/android/mm/libhardware_stub.c deleted file mode 100644 index 00f15cd90cac..000000000000 --- a/src/android/mm/libhardware_stub.c +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ -/* - * Copyright (C) 2023, Ideas on Board - * - * libhardware_stub.c - Android libhardware stub for test compilation - */ - -#include - -#include - -int hw_get_module(const char *id __attribute__((__unused__)), - const struct hw_module_t **module) -{ - *module = NULL; - return -ENOTSUP; -} diff --git a/src/android/mm/meson.build b/src/android/mm/meson.build index e9ceb3afba67..203b8c3e5804 100644 --- a/src/android/mm/meson.build +++ b/src/android/mm/meson.build @@ -4,13 +4,11 @@ platform = get_option('android_platform') if platform == 'generic' android_hal_sources += files(['generic_camera_buffer.cpp', 'generic_frame_buffer_allocator.cpp']) - android_deps += [libdl] - libhardware = dependency('libhardware', required : false) - if libhardware.found() - android_deps += [libhardware] + libui = dependency('libui', required : false) + if libui.found() + android_deps += [libui] else - android_hal_sources += files(['libhardware_stub.c']) android_hal_sources += files(['graphic_buffer_allocator_stub.cpp']) endif elif platform == 'cros'