@@ -29,15 +29,10 @@
#include <ui/PixelFormat.h>
#include <utils/Errors.h>
-#include <utils/KeyedVector.h>
-#include <utils/Mutex.h>
#include <utils/Singleton.h>
namespace android {
-class GrallocAllocator;
-class GraphicBufferMapper;
-
class GraphicBufferAllocator : public Singleton<GraphicBufferAllocator>
{
public:
@@ -52,25 +47,6 @@ public:
uint64_t usage, buffer_handle_t* handle, uint32_t* stride,
std::string requestorName);
- /**
- * Allocates and does NOT import a gralloc buffer. Buffers cannot be used until they have
- * been imported. This function is for advanced use cases only.
- *
- * The raw native handle must be freed by calling native_handle_close() followed by
- * native_handle_delete().
- */
- status_t allocateRawHandle(uint32_t w, uint32_t h, PixelFormat format, uint32_t layerCount,
- uint64_t usage, buffer_handle_t* handle, uint32_t* stride,
- std::string requestorName);
-
- /**
- * DEPRECATED: GraphicBufferAllocator does not use the graphicBufferId.
- */
- status_t allocate(uint32_t w, uint32_t h, PixelFormat format,
- uint32_t layerCount, uint64_t usage,
- buffer_handle_t* handle, uint32_t* stride, uint64_t graphicBufferId,
- std::string requestorName);
-
status_t free(buffer_handle_t handle);
uint64_t getTotalSize() const;
@@ -94,15 +70,9 @@ protected:
uint64_t usage, buffer_handle_t* handle, uint32_t* stride,
std::string requestorName, bool importBuffer);
- static Mutex sLock;
- static KeyedVector<buffer_handle_t, alloc_rec_t> sAllocList;
-
friend class Singleton<GraphicBufferAllocator>;
GraphicBufferAllocator();
~GraphicBufferAllocator();
-
- GraphicBufferMapper& mMapper;
- std::unique_ptr<const GrallocAllocator> mAllocator;
};
// ---------------------------------------------------------------------------
new file mode 100644
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+/*
+ * Copyright (C) 2023, Ideas on Board
+ * Copyright (C) 2023, BayLibre
+ *
+ * graphic_buffer_allocator_stub.cpp - Android GraphicBufferAllocator
+ * stub for compile-testing
+ */
+
+#include <ui/GraphicBufferAllocator.h>
+
+namespace android {
+
+ANDROID_SINGLETON_STATIC_INSTANCE(GraphicBufferAllocator)
+
+GraphicBufferAllocator::GraphicBufferAllocator()
+{
+}
+GraphicBufferAllocator::~GraphicBufferAllocator()
+{
+}
+
+uint64_t GraphicBufferAllocator::getTotalSize() const
+{
+ return 0;
+}
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+status_t GraphicBufferAllocator::allocate(uint32_t width,
+ uint32_t height,
+ PixelFormat format,
+ uint32_t layerCount,
+ uint64_t usage,
+ buffer_handle_t *handle,
+ uint32_t *stride,
+ std::string requestorName)
+{
+ *handle = nullptr;
+ *stride = 0;
+ return INVALID_OPERATION;
+}
+
+status_t GraphicBufferAllocator::free(buffer_handle_t handle)
+{
+ return INVALID_OPERATION;
+}
+#pragma GCC diagnostic pop
+
+}; // namespace android
@@ -11,6 +11,7 @@ if platform == 'generic'
android_deps += [libhardware]
else
android_hal_sources += files(['libhardware_stub.c'])
+ android_hal_sources += files(['graphic_buffer_allocator_stub.cpp'])
endif
elif platform == 'cros'
android_hal_sources += files(['cros_camera_buffer.cpp',
If we want to keep building libcamera on traditional Linux systems with: -Dandroid=enabled -Dandroid_platform=generic We should stub GraphicBufferAllocator, which is not available. It's only available when building with the VNDK or when building within the AOSP tree. Also remove some deprecated methods and inclusions which are not needed for the stub class. Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> --- .../libs/ui/include/ui/GraphicBufferAllocator.h | 30 ------------- src/android/mm/graphic_buffer_allocator_stub.cpp | 50 ++++++++++++++++++++++ src/android/mm/meson.build | 1 + 3 files changed, 51 insertions(+), 30 deletions(-)