BufferQueueProducer: add detachNextBuffer
Adds a new method, IGBP::detachNextBuffer, that effectively does
dequeue + request + detach in a single call, but does not need to
know anything about the dequeued buffer, and will not block on
dequeue. This is mostly for the upcoming StreamSplitter to use in
its onBufferReleased callback.
Change-Id: Ie88a69de109003acebaa486a5b44c8a455726550
diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index c0b08c1..aa6acb9 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -37,6 +37,7 @@
SET_BUFFER_COUNT,
DEQUEUE_BUFFER,
DETACH_BUFFER,
+ DETACH_NEXT_BUFFER,
ATTACH_BUFFER,
QUEUE_BUFFER,
CANCEL_BUFFER,
@@ -123,6 +124,37 @@
return result;
}
+ virtual status_t detachNextBuffer(sp<GraphicBuffer>* outBuffer,
+ sp<Fence>* outFence) {
+ if (outBuffer == NULL) {
+ ALOGE("detachNextBuffer: outBuffer must not be NULL");
+ return BAD_VALUE;
+ } else if (outFence == NULL) {
+ ALOGE("detachNextBuffer: outFence must not be NULL");
+ return BAD_VALUE;
+ }
+ Parcel data, reply;
+ data.writeInterfaceToken(IGraphicBufferProducer::getInterfaceDescriptor());
+ status_t result = remote()->transact(DETACH_NEXT_BUFFER, data, &reply);
+ if (result != NO_ERROR) {
+ return result;
+ }
+ result = reply.readInt32();
+ if (result == NO_ERROR) {
+ bool nonNull = reply.readInt32();
+ if (nonNull) {
+ *outBuffer = new GraphicBuffer;
+ reply.read(**outBuffer);
+ }
+ nonNull = reply.readInt32();
+ if (nonNull) {
+ *outFence = new Fence;
+ reply.read(**outFence);
+ }
+ }
+ return result;
+ }
+
virtual status_t attachBuffer(int* slot, const sp<GraphicBuffer>& buffer) {
Parcel data, reply;
data.writeInterfaceToken(IGraphicBufferProducer::getInterfaceDescriptor());
@@ -274,6 +306,24 @@
reply->writeInt32(result);
return NO_ERROR;
} break;
+ case DETACH_NEXT_BUFFER: {
+ CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
+ sp<GraphicBuffer> buffer;
+ sp<Fence> fence;
+ int32_t result = detachNextBuffer(&buffer, &fence);
+ reply->writeInt32(result);
+ if (result == NO_ERROR) {
+ reply->writeInt32(buffer != NULL);
+ if (buffer != NULL) {
+ reply->write(*buffer);
+ }
+ reply->writeInt32(fence != NULL);
+ if (fence != NULL) {
+ reply->write(*fence);
+ }
+ }
+ return NO_ERROR;
+ } break;
case ATTACH_BUFFER: {
CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
sp<GraphicBuffer> buffer = new GraphicBuffer();