diff options
author | Dan Stoza <stoza@google.com> | 2014-11-07 19:48:51 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 19:48:51 +0000 |
commit | 034d674721029e3b7e34fe30ee31814c521b62bf (patch) | |
tree | f09b7bb9b88d37985ca41e255f4efc8ffa769905 /cmds | |
parent | 7e88fac080e3bb1cdc95667f82727ea6c19fb173 (diff) | |
parent | 1609e451cf6101efe6aeaaa2da61db2cb095c9e8 (diff) | |
download | frameworks_av-034d674721029e3b7e34fe30ee31814c521b62bf.zip frameworks_av-034d674721029e3b7e34fe30ee31814c521b62bf.tar.gz frameworks_av-034d674721029e3b7e34fe30ee31814c521b62bf.tar.bz2 |
am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '1609e451cf6101efe6aeaaa2da61db2cb095c9e8':
Add a BufferItem parameter to onFrameAvailable
Diffstat (limited to 'cmds')
-rw-r--r-- | cmds/screenrecord/FrameOutput.cpp | 2 | ||||
-rw-r--r-- | cmds/screenrecord/FrameOutput.h | 2 | ||||
-rw-r--r-- | cmds/screenrecord/Overlay.cpp | 2 | ||||
-rw-r--r-- | cmds/screenrecord/Overlay.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cmds/screenrecord/FrameOutput.cpp b/cmds/screenrecord/FrameOutput.cpp index 03e0062..bef74f5 100644 --- a/cmds/screenrecord/FrameOutput.cpp +++ b/cmds/screenrecord/FrameOutput.cpp @@ -206,7 +206,7 @@ void FrameOutput::reduceRgbaToRgb(uint8_t* buf, unsigned int pixelCount) { } // Callback; executes on arbitrary thread. -void FrameOutput::onFrameAvailable() { +void FrameOutput::onFrameAvailable(const BufferItem& /* item */) { Mutex::Autolock _l(mMutex); mFrameAvailable = true; mEventCond.signal(); diff --git a/cmds/screenrecord/FrameOutput.h b/cmds/screenrecord/FrameOutput.h index c49ec3b..4c0c3be 100644 --- a/cmds/screenrecord/FrameOutput.h +++ b/cmds/screenrecord/FrameOutput.h @@ -62,7 +62,7 @@ private: } // (overrides GLConsumer::FrameAvailableListener method) - virtual void onFrameAvailable(); + virtual void onFrameAvailable(const BufferItem& item); // Reduces RGBA to RGB, in place. static void reduceRgbaToRgb(uint8_t* buf, unsigned int pixelCount); diff --git a/cmds/screenrecord/Overlay.cpp b/cmds/screenrecord/Overlay.cpp index 7fef53d..c659170 100644 --- a/cmds/screenrecord/Overlay.cpp +++ b/cmds/screenrecord/Overlay.cpp @@ -274,7 +274,7 @@ void Overlay::getTimeString_l(nsecs_t monotonicNsec, char* buf, size_t bufLen) { } // Callback; executes on arbitrary thread. -void Overlay::onFrameAvailable() { +void Overlay::onFrameAvailable(const BufferItem& /* item */) { ALOGV("Overlay::onFrameAvailable"); Mutex::Autolock _l(mMutex); mFrameAvailable = true; diff --git a/cmds/screenrecord/Overlay.h b/cmds/screenrecord/Overlay.h index b1b5c29..ee3444d 100644 --- a/cmds/screenrecord/Overlay.h +++ b/cmds/screenrecord/Overlay.h @@ -78,7 +78,7 @@ private: const Program& texRender, TextRenderer& textRenderer); // (overrides GLConsumer::FrameAvailableListener method) - virtual void onFrameAvailable(); + virtual void onFrameAvailable(const BufferItem& item); // (overrides Thread method) virtual bool threadLoop(); |