gralloc: name buffer at allocation time
Allow the client to name their buffer at allocation time.
b/141632767 will let the client(s) query the name of the
buffer later.
Bug: 144026910
Test: VtsHalGraphicsMapperV4_0TargetTest
Change-Id: Ib08c1909c10a1778c50b59e0a42ddf19140d8f03
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 67d5bbe..667aed4 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -6224,9 +6224,10 @@
android::hardware::graphics::mapper::V3_0::IMapper::getService();
sp<android::hardware::graphics::mapper::V2_0::IMapper> mapper =
android::hardware::graphics::mapper::V2_0::IMapper::getService();
- ::android::hardware::hidl_vec<uint32_t> descriptor;
if (mapperV4 != nullptr && allocatorV4 != nullptr) {
+ ::android::hardware::hidl_vec<uint8_t> descriptor;
android::hardware::graphics::mapper::V4_0::IMapper::BufferDescriptorInfo descriptorInfo{};
+ descriptorInfo.name = "VtsHalCameraProviderV2_4";
descriptorInfo.width = width;
descriptorInfo.height = height;
descriptorInfo.layerCount = 1;
@@ -6236,7 +6237,7 @@
auto ret = mapperV4->createDescriptor(
descriptorInfo, [&descriptor](android::hardware::graphics::mapper::V4_0::Error err,
- ::android::hardware::hidl_vec<uint32_t> desc) {
+ ::android::hardware::hidl_vec<uint8_t> desc) {
ASSERT_EQ(err, android::hardware::graphics::mapper::V4_0::Error::NONE);
descriptor = desc;
});
@@ -6253,6 +6254,7 @@
});
ASSERT_TRUE(ret.isOk());
} else if (mapperV3 != nullptr && allocatorV3 != nullptr) {
+ ::android::hardware::hidl_vec<uint32_t> descriptor;
android::hardware::graphics::mapper::V3_0::IMapper::BufferDescriptorInfo descriptorInfo {};
descriptorInfo.width = width;
descriptorInfo.height = height;
@@ -6278,6 +6280,7 @@
});
ASSERT_TRUE(ret.isOk());
} else {
+ ::android::hardware::hidl_vec<uint32_t> descriptor;
ASSERT_NE(mapper.get(), nullptr);
ASSERT_NE(allocator.get(), nullptr);
android::hardware::graphics::mapper::V2_0::IMapper::BufferDescriptorInfo descriptorInfo {};
diff --git a/graphics/mapper/4.0/IMapper.hal b/graphics/mapper/4.0/IMapper.hal
index 85c7c81..c809349 100644
--- a/graphics/mapper/4.0/IMapper.hal
+++ b/graphics/mapper/4.0/IMapper.hal
@@ -23,6 +23,11 @@
interface IMapper {
struct BufferDescriptorInfo {
/**
+ * The name of the buffer. Useful for debugging/tracing.
+ */
+ string name;
+
+ /**
* The width specifies how many columns of pixels must be in the
* allocated buffer, but does not necessarily represent the offset in
* columns between the same column in adjacent rows. The rows may be
diff --git a/graphics/mapper/4.0/types.hal b/graphics/mapper/4.0/types.hal
index 603b243..2fdfa65 100644
--- a/graphics/mapper/4.0/types.hal
+++ b/graphics/mapper/4.0/types.hal
@@ -51,7 +51,7 @@
* createDescriptor(). It describes the properties of a buffer and is consumed
* by the allocator.
*/
-typedef vec<uint32_t> BufferDescriptor;
+typedef vec<uint8_t> BufferDescriptor;
/**
* Structure for describing YCbCr formats for consumption by applications.
diff --git a/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp b/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp
index 706c658..6a4bd49 100644
--- a/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp
+++ b/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp
@@ -58,6 +58,7 @@
GraphicsMapperHidlEnvironment::Instance()->getServiceName<IAllocator>(),
GraphicsMapperHidlEnvironment::Instance()->getServiceName<IMapper>()));
+ mDummyDescriptorInfo.name = "dummy";
mDummyDescriptorInfo.width = 64;
mDummyDescriptorInfo.height = 64;
mDummyDescriptorInfo.layerCount = 1;