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

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

Merge "BufferQueue: Increase max slots from 32 to 64"

parents 017a5385 febd4f4f

include/gui/BufferQueue.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ class BufferQueue : public BQProducer, 
public:

public:

    // BufferQueue will keep track of at most this value of buffers.

    // BufferQueue will keep track of at most this value of buffers.

    // Attempts at runtime to increase the number of buffers past this will fail.

    // Attempts at runtime to increase the number of buffers past this will fail.

    enum { NUM_BUFFER_SLOTS = 32 };

    enum { NUM_BUFFER_SLOTS = BufferQueueDefs::NUM_BUFFER_SLOTS };

    // Used as a placeholder slot# when the value isn't pointing to an existing buffer.

    // Used as a placeholder slot# when the value isn't pointing to an existing buffer.

    enum { INVALID_BUFFER_SLOT = IGraphicBufferConsumer::BufferItem::INVALID_BUFFER_SLOT };

    enum { INVALID_BUFFER_SLOT = IGraphicBufferConsumer::BufferItem::INVALID_BUFFER_SLOT };

    // Alias to <IGraphicBufferConsumer.h> -- please scope from there in future code!

    // Alias to <IGraphicBufferConsumer.h> -- please scope from there in future code!
@@ -321,7 +321,7 @@ public: 
    // but have not yet been released by the consumer.

    // but have not yet been released by the consumer.

    //

    //

    // This should be called from the onBuffersReleased() callback.

    // This should be called from the onBuffersReleased() callback.

    virtual status_t getReleasedBuffers(uint32_t* slotMask);

    virtual status_t getReleasedBuffers(uint64_t* slotMask);





    // setDefaultBufferSize is used to set the size of buffers returned by

    // setDefaultBufferSize is used to set the size of buffers returned by

    // dequeueBuffer when a width and height of zero is requested.  Default

    // dequeueBuffer when a width and height of zero is requested.  Default

include/gui/BufferQueueConsumer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ public: 
    // but have not yet been released by the consumer.

    // but have not yet been released by the consumer.

    //

    //

    // This should be called from the onBuffersReleased() callback.

    // This should be called from the onBuffersReleased() callback.

    virtual status_t getReleasedBuffers(uint32_t* outSlotMask);

    virtual status_t getReleasedBuffers(uint64_t* outSlotMask);





    // setDefaultBufferSize is used to set the size of buffers returned by

    // setDefaultBufferSize is used to set the size of buffers returned by

    // dequeueBuffer when a width and height of zero is requested.  Default

    // dequeueBuffer when a width and height of zero is requested.  Default

include/gui/BufferQueueDefs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ namespace android { 
        // BufferQueue will keep track of at most this value of buffers.

        // BufferQueue will keep track of at most this value of buffers.

        // Attempts at runtime to increase the number of buffers past this

        // Attempts at runtime to increase the number of buffers past this

        // will fail.

        // will fail.

        enum { NUM_BUFFER_SLOTS = 32 };

        enum { NUM_BUFFER_SLOTS = 64 };





        typedef BufferSlot SlotsType[NUM_BUFFER_SLOTS];

        typedef BufferSlot SlotsType[NUM_BUFFER_SLOTS];

    } // namespace BufferQueueDefs

    } // namespace BufferQueueDefs

include/gui/IGraphicBufferConsumer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -233,7 +233,7 @@ public: 
    //

    //

    // Return of a value other than NO_ERROR means an error has occurred:

    // Return of a value other than NO_ERROR means an error has occurred:

    // * NO_INIT - the buffer queue has been abandoned.

    // * NO_INIT - the buffer queue has been abandoned.

    virtual status_t getReleasedBuffers(uint32_t* slotMask) = 0;

    virtual status_t getReleasedBuffers(uint64_t* slotMask) = 0;





    // setDefaultBufferSize is used to set the size of buffers returned by

    // setDefaultBufferSize is used to set the size of buffers returned by

    // dequeueBuffer when a width and height of zero is requested.  Default

    // dequeueBuffer when a width and height of zero is requested.  Default

libs/gui/BufferQueue.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ status_t BufferQueue::consumerDisconnect() { 
    return mConsumer->disconnect();

    return mConsumer->disconnect();

}

}





status_t BufferQueue::getReleasedBuffers(uint32_t* slotMask) {

status_t BufferQueue::getReleasedBuffers(uint64_t* slotMask) {

    return mConsumer->getReleasedBuffers(slotMask);

    return mConsumer->getReleasedBuffers(slotMask);

}

}