diff options
| author | 2017-02-17 22:21:01 +0000 | |
|---|---|---|
| committer | 2017-02-17 22:21:08 +0000 | |
| commit | fb94f1db72bd769d4a63e2baf0b5a4ca5da7a86f (patch) | |
| tree | 48cda750cb8509b337c9ea8c40a315bc3995d6f1 /include/gui/ConsumerBase.h | |
| parent | f810b29ebc8564f94ff7fb14f2d13a0f4d111703 (diff) | |
| parent | a9347647eca3101c014be902b713772de3977d87 (diff) | |
Merge "Break a dependency of libui on libandroid"
Diffstat (limited to 'include/gui/ConsumerBase.h')
| -rw-r--r-- | include/gui/ConsumerBase.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/gui/ConsumerBase.h b/include/gui/ConsumerBase.h index ce85fc3e8d..7912528ba7 100644 --- a/include/gui/ConsumerBase.h +++ b/include/gui/ConsumerBase.h @@ -17,19 +17,23 @@ #ifndef ANDROID_GUI_CONSUMERBASE_H #define ANDROID_GUI_CONSUMERBASE_H -#include <gui/BufferQueue.h> +#include <gui/BufferQueueDefs.h> +#include <gui/IConsumerListener.h> +#include <gui/IGraphicBufferConsumer.h> +#include <gui/OccupancyTracker.h> -#include <ui/GraphicBuffer.h> +#include <ui/PixelFormat.h> #include <utils/String8.h> #include <utils/Vector.h> #include <utils/threads.h> -#include <gui/IConsumerListener.h> + namespace android { // ---------------------------------------------------------------------------- class String8; +class GraphicBuffer; // ConsumerBase is a base class for BufferQueue consumer end-points. It // handles common tasks like management of the connection to the BufferQueue @@ -222,7 +226,7 @@ protected: // slot that has not yet been used. The buffer allocated to a slot will also // be replaced if the requested buffer usage or geometry differs from that // of the buffer allocated to a slot. - Slot mSlots[BufferQueue::NUM_BUFFER_SLOTS]; + Slot mSlots[BufferQueueDefs::NUM_BUFFER_SLOTS]; // mAbandoned indicates that the BufferQueue will no longer be used to // consume images buffers pushed to it using the IGraphicBufferProducer |