Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b08004f8 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "libgui: Add a BufferItem overload to IGBC::acquire"

parents 3c0876f4 de7100ab

include/gui/BufferQueueConsumer.h

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ public: 
    // is CLOCK_MONOTONIC.

    virtual status_t acquireBuffer(BufferItem* outBuffer,

            nsecs_t expectedPresent);

    virtual status_t acquireBuffer(android::BufferItem* outBuffer,

            nsecs_t expectedPresent);



    // See IGraphicBufferConsumer::detachBuffer

    virtual status_t detachBuffer(int slot);

include/gui/IGraphicBufferConsumer.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
namespace android {

// ----------------------------------------------------------------------------



class BufferItem;

class Fence;

class GraphicBuffer;

class IConsumerListener;
@@ -147,6 +148,7 @@ public: 
    // Return of a negative value means an error has occurred:

    // * INVALID_OPERATION - too many buffers have been acquired

    virtual status_t acquireBuffer(BufferItem* buffer, nsecs_t presentWhen) = 0;

    virtual status_t acquireBuffer(android::BufferItem* buffer, nsecs_t presentWhen) = 0;



    // detachBuffer attempts to remove all ownership of the buffer in the given

    // slot from the buffer queue. If this call succeeds, the slot will be

libs/gui/BufferQueueConsumer.cpp

+16 −0
Original line number Diff line number Diff line
@@ -176,6 +176,22 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer, 
    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);

libs/gui/IGraphicBufferConsumer.cpp

+16 −0
Original line number Diff line number Diff line
@@ -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 @@ public: 
        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());