Add metadata in direct display surface to support ANativeWindow use cases.
When direct display surface is used with metadata, ComsumerQueue dequeue
reports error because metadata size is hardcoded as 0. It breaks
ANativeWindow case because it has a metadata on the fly.
Create a metadata structure, which could be read and used in the future.
Bug: 64155181
Test: Manual
Change-Id: Ieb35a69d26213769497c6afc7151dd135150c795
diff --git a/libs/vr/libvrflinger/display_surface.h b/libs/vr/libvrflinger/display_surface.h
index 556183a..6db3f55 100644
--- a/libs/vr/libvrflinger/display_surface.h
+++ b/libs/vr/libvrflinger/display_surface.h
@@ -143,7 +143,8 @@
const display::SurfaceAttributes& attributes)
: DisplaySurface(service, SurfaceType::Direct, surface_id, process_id,
user_id, attributes),
- acquired_buffers_(kMaxPostedBuffers) {}
+ acquired_buffers_(kMaxPostedBuffers),
+ metadata_(nullptr){}
std::vector<int32_t> GetQueueIds() const override;
bool IsBufferAvailable();
bool IsBufferPosted();
@@ -178,6 +179,9 @@
RingBuffer<AcquiredBuffer> acquired_buffers_;
std::shared_ptr<ConsumerQueue> direct_queue_;
+
+ // Stores metadata when it dequeue buffers from consumer queue.
+ std::unique_ptr<uint8_t[]> metadata_;
};
} // namespace dvr