libgui: Add a BufferItem overload to IGBC::acquire
Adds an overload of IGraphicBufferConsumer::acquireBuffer which takes
an android::BufferItem instead of an IGBC::BufferItem.
Change-Id: I9c3bc8037fa9438d4d9080b8afb694219ef2f71f
diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp
index 526c3b7..be4bec0 100644
--- a/libs/gui/BufferQueueConsumer.cpp
+++ b/libs/gui/BufferQueueConsumer.cpp
@@ -176,6 +176,22 @@
return NO_ERROR;
}
+status_t BufferQueueConsumer::acquireBuffer(android::BufferItem* outBuffer,
+ nsecs_t expectedPresent) {
+ if (outBuffer == nullptr) {
+ return BAD_VALUE;
+ }
+
+ android::BufferItem item;
+ status_t result = acquireBuffer(&item, expectedPresent);
+ if (result != NO_ERROR) {
+ return result;
+ }
+
+ *outBuffer = item;
+ return NO_ERROR;
+}
+
status_t BufferQueueConsumer::detachBuffer(int slot) {
ATRACE_CALL();
ATRACE_BUFFER_INDEX(slot);
diff --git a/libs/gui/IGraphicBufferConsumer.cpp b/libs/gui/IGraphicBufferConsumer.cpp
index f38abbe..edf4408 100644
--- a/libs/gui/IGraphicBufferConsumer.cpp
+++ b/libs/gui/IGraphicBufferConsumer.cpp
@@ -23,6 +23,7 @@
#include <binder/Parcel.h>
#include <binder/IInterface.h>
+#include <gui/BufferItem.h>
#include <gui/IConsumerListener.h>
#include <gui/IGraphicBufferConsumer.h>
@@ -237,6 +238,21 @@
return reply.readInt32();
}
+ virtual status_t acquireBuffer(android::BufferItem* buffer,
+ nsecs_t presentWhen) {
+ if (buffer == nullptr) {
+ return BAD_VALUE;
+ }
+
+ BufferItem item;
+ status_t result = acquireBuffer(&item, presentWhen);
+ if (result != NO_ERROR) {
+ return result;
+ }
+ *buffer = item;
+ return NO_ERROR;
+ }
+
virtual status_t detachBuffer(int slot) {
Parcel data, reply;
data.writeInterfaceToken(IGraphicBufferConsumer::getInterfaceDescriptor());