summaryrefslogtreecommitdiff
path: root/include/gui/BufferQueue.h
diff options
context:
space:
mode:
author Brian C. Anderson <brianderson@google.com> 2017-02-17 22:17:35 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-02-17 22:17:36 +0000
commitf810b29ebc8564f94ff7fb14f2d13a0f4d111703 (patch)
treed99aec6c734c984cfb96779aedc1549646ebc3a5 /include/gui/BufferQueue.h
parent873e2eee781f323a8aa0283cab5924fa4cd7ecfe (diff)
parent5ea5e5905170f32d5cf45ad35c552d64743892c3 (diff)
Merge changes from topic 'GPU_replace_GL'
* changes: Fix unexpected FrameEvents on BufferQueue reconnect Add FrameEvents::isValidTimestamp Change GL references to GPU for getFrameTimestamps. Clean up FrameTimestamp log messages.
Diffstat (limited to 'include/gui/BufferQueue.h')
-rw-r--r--include/gui/BufferQueue.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/gui/BufferQueue.h b/include/gui/BufferQueue.h
index a523cd80bf..c95c535363 100644
--- a/include/gui/BufferQueue.h
+++ b/include/gui/BufferQueue.h
@@ -62,11 +62,12 @@ public:
public:
explicit ProxyConsumerListener(const wp<ConsumerListener>& consumerListener);
virtual ~ProxyConsumerListener();
- virtual void onFrameAvailable(const BufferItem& item) override;
- virtual void onFrameReplaced(const BufferItem& item) override;
- virtual void onBuffersReleased() override;
- virtual void onSidebandStreamChanged() override;
- virtual void addAndGetFrameTimestamps(
+ void onDisconnect() override;
+ void onFrameAvailable(const BufferItem& item) override;
+ void onFrameReplaced(const BufferItem& item) override;
+ void onBuffersReleased() override;
+ void onSidebandStreamChanged() override;
+ void addAndGetFrameTimestamps(
const NewFrameEventsEntry* newTimestamps,
FrameEventHistoryDelta* outDelta) override;
private: