summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorMattijs Korpershoek <mkorpershoek@baylibre.com>2023-02-28 16:17:13 +0100
committerMattijs Korpershoek <mkorpershoek@baylibre.com>2023-10-13 16:31:13 +0200
commit5de271fe6c0f909006141ea26a7b94c1102be31d (patch)
tree5f91f6622075b1744ecd75eaa0cb294fe585e186 /src/android
parentabe2fea38b2431edd9a18d59914aea281230f89c (diff)
android: mm: generic: Use GraphicBufferAllocator instead of gralloc.h
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. Notes: * GraphicsBufferAllocator being a Singleton, buffer lifecycle management is easier. * The imported headers from Android generate the -Wextra-semi warning. To avoid patching the files, a pragma has been added before inclusion. * libdl was used for dlclosing() the legacy hal, so the dep has been dropped Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/mm/generic_frame_buffer_allocator.cpp68
-rw-r--r--src/android/mm/meson.build5
2 files changed, 23 insertions, 50 deletions
diff --git a/src/android/mm/generic_frame_buffer_allocator.cpp b/src/android/mm/generic_frame_buffer_allocator.cpp
index 7ecef2c6..1f2fbe33 100644
--- a/src/android/mm/generic_frame_buffer_allocator.cpp
+++ b/src/android/mm/generic_frame_buffer_allocator.cpp
@@ -16,8 +16,11 @@
#include "libcamera/internal/framebuffer.h"
#include <hardware/camera3.h>
-#include <hardware/gralloc.h>
-#include <hardware/hardware.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wextra-semi"
+#include <ui/GraphicBufferAllocator.h>
+#pragma GCC diagnostic pop
+#include <utils/Errors.h>
#include "../camera_device.h"
#include "../frame_buffer_allocator.h"
@@ -33,35 +36,26 @@ class GenericFrameBufferData : public FrameBuffer::Private
LIBCAMERA_DECLARE_PUBLIC(FrameBuffer)
public:
- GenericFrameBufferData(struct alloc_device_t *allocDevice,
- buffer_handle_t handle,
+ GenericFrameBufferData(buffer_handle_t handle,
const std::vector<FrameBuffer::Plane> &planes)
- : FrameBuffer::Private(planes), allocDevice_(allocDevice),
- handle_(handle)
+ : FrameBuffer::Private(planes), 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_);
+ auto &allocator = android::GraphicBufferAllocator::get();
+ android::status_t status = allocator.free(handle_);
+ if (status != android::NO_ERROR)
+ LOG(HAL, Error) << "Error freeing framebuffer: " << status;
}
private:
- struct alloc_device_t *allocDevice_;
const buffer_handle_t handle_;
};
} /* namespace */
@@ -72,51 +66,33 @@ class PlatformFrameBufferAllocator::Private : public Extensible::Private
public:
Private(CameraDevice *const cameraDevice)
- : cameraDevice_(cameraDevice),
- hardwareModule_(nullptr),
- allocDevice_(nullptr)
+ : cameraDevice_(cameraDevice)
{
- hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &hardwareModule_);
- ASSERT(hardwareModule_);
}
- ~Private() override;
+ ~Private() = default;
std::unique_ptr<HALFrameBuffer>
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_;
};
-PlatformFrameBufferAllocator::Private::~Private()
-{
- if (allocDevice_)
- gralloc_close(allocDevice_);
- dlclose(hardwareModule_->dso);
-}
-
std::unique_ptr<HALFrameBuffer>
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;
+
+ auto &allocator = android::GraphicBufferAllocator::get();
+ android::status_t status = allocator.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) {
@@ -143,7 +119,7 @@ PlatformFrameBufferAllocator::Private::allocate(int halPixelFormat,
return std::make_unique<HALFrameBuffer>(
std::make_unique<GenericFrameBufferData>(
- allocDevice_, handle, planes),
+ handle, planes),
handle);
}
diff --git a/src/android/mm/meson.build b/src/android/mm/meson.build
index 85f12f91..702f2ea6 100644
--- a/src/android/mm/meson.build
+++ b/src/android/mm/meson.build
@@ -4,10 +4,7 @@ platform = get_option('android_platform')
if platform == 'generic'
android_hal_sources += files(['generic_camera_buffer.cpp',
'generic_frame_buffer_allocator.cpp'])
- android_deps += [
- libdl,
- dependency('libhardware'),
- ]
+ android_deps += [dependency('libui')]
elif platform == 'cros'
android_hal_sources += files(['cros_camera_buffer.cpp',
'cros_frame_buffer_allocator.cpp'])