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

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

Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master

parents 9e99fce8 955c8974

include/gui/BufferItem.h

+2 −4
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
#include <EGL/egl.h>

#include <EGL/eglext.h>



#include <gui/IGraphicBufferConsumer.h>



#include <ui/Rect.h>



#include <system/graphics.h>



#include <utils/Flattenable.h>

#include <utils/StrongPointer.h>
@@ -44,9 +44,7 @@ class BufferItem : public Flattenable<BufferItem> { 
    // The default value of mBuf, used to indicate this doesn't correspond to a slot.

    enum { INVALID_BUFFER_SLOT = -1 };

    BufferItem();

    BufferItem(const IGraphicBufferConsumer::BufferItem& item);

    ~BufferItem();

    operator IGraphicBufferConsumer::BufferItem() const;



    static const char* scalingModeName(uint32_t scalingMode);

include/gui/BufferItemConsumer.h

+1 −5
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ class BufferItemConsumer: public ConsumerBase 
  public:

    typedef ConsumerBase::FrameAvailableListener FrameAvailableListener;



    typedef BufferQueue::BufferItem BufferItem;



    enum { DEFAULT_MAX_BUFFERS = -1 };

    enum { INVALID_BUFFER_SLOT = BufferQueue::INVALID_BUFFER_SLOT };

    enum { NO_BUFFER_AVAILABLE = BufferQueue::NO_BUFFER_AVAILABLE };
@@ -76,9 +74,7 @@ class BufferItemConsumer: public ConsumerBase 
    //

    // If waitForFence is true, and the acquired BufferItem has a valid fence object,

    // acquireBuffer will wait on the fence with no timeout before returning.

    status_t acquireBuffer(BufferQueue::BufferItem *item, nsecs_t presentWhen,

            bool waitForFence = true);

    status_t acquireBuffer(android::BufferItem* item, nsecs_t presentWhen,

    status_t acquireBuffer(BufferItem* item, nsecs_t presentWhen,

            bool waitForFence = true);



    // Returns an acquired buffer to the queue, allowing it to be reused. Since

include/gui/BufferQueue.h

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef ANDROID_GUI_BUFFERQUEUE_H

#define ANDROID_GUI_BUFFERQUEUE_H



#include <gui/BufferItem.h>

#include <gui/BufferQueueDefs.h>

#include <gui/IGraphicBufferConsumer.h>

#include <gui/IGraphicBufferProducer.h>
@@ -34,7 +35,7 @@ public: 
    // Attempts at runtime to increase the number of buffers past this will fail.

    enum { NUM_BUFFER_SLOTS = BufferQueueDefs::NUM_BUFFER_SLOTS };

    // 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 = BufferItem::INVALID_BUFFER_SLOT };

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

    enum {

        NO_BUFFER_AVAILABLE = IGraphicBufferConsumer::NO_BUFFER_AVAILABLE,
@@ -47,7 +48,6 @@ public: 


    // for backward source compatibility

    typedef ::android::ConsumerListener ConsumerListener;

    typedef IGraphicBufferConsumer::BufferItem BufferItem;



    // ProxyConsumerListener is a ConsumerListener implementation that keeps a weak

    // reference to the actual consumer object.  It forwards all calls to that
@@ -62,7 +62,7 @@ public: 
    public:

        ProxyConsumerListener(const wp<ConsumerListener>& consumerListener);

        virtual ~ProxyConsumerListener();

        virtual void onFrameAvailable(const android::BufferItem& item);

        virtual void onFrameAvailable(const BufferItem& item);

        virtual void onBuffersReleased();

        virtual void onSidebandStreamChanged();

    private:

include/gui/BufferQueueConsumer.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ 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/BufferQueueCore.h

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef ANDROID_GUI_BUFFERQUEUECORE_H

#define ANDROID_GUI_BUFFERQUEUECORE_H



#include <gui/BufferItem.h>

#include <gui/BufferQueueDefs.h>

#include <gui/BufferSlot.h>
@@ -45,7 +46,6 @@ 


namespace android {



class BufferItem;

class IConsumerListener;

class IGraphicBufferAlloc;

class IProducerListener;
@@ -58,7 +58,7 @@ class BufferQueueCore : public virtual RefBase { 
public:

    // Used as a placeholder slot number when the value isn't pointing to an

    // existing buffer.

    enum { INVALID_BUFFER_SLOT = -1 }; // TODO: Extract from IGBC::BufferItem

    enum { INVALID_BUFFER_SLOT = BufferItem::INVALID_BUFFER_SLOT };



    // We reserve two slots in order to guarantee that the producer and

    // consumer can run asynchronously.