diff options
author | Dan Stoza <stoza@google.com> | 2014-11-07 19:44:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-07 19:44:33 +0000 |
commit | e0e834e3fe5561bf87aac7f88faaed39f0937a64 (patch) | |
tree | a70aba6faed4c2c71a658847c02ef4772f1a03ca /tests | |
parent | 8d3acf6e6e58c392fcdc4913e49c6b1ded8117c8 (diff) | |
parent | 32ef0cae6319c7d40d883c1c9839ff04b5ac9f72 (diff) | |
download | hardware_libhardware-e0e834e3fe5561bf87aac7f88faaed39f0937a64.zip hardware_libhardware-e0e834e3fe5561bf87aac7f88faaed39f0937a64.tar.gz hardware_libhardware-e0e834e3fe5561bf87aac7f88faaed39f0937a64.tar.bz2 |
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
Diffstat (limited to 'tests')
-rw-r--r-- | tests/camera2/CameraStreamFixture.h | 2 | ||||
-rw-r--r-- | tests/camera2/camera2_utils.cpp | 2 | ||||
-rw-r--r-- | tests/camera2/camera2_utils.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/camera2/CameraStreamFixture.h b/tests/camera2/CameraStreamFixture.h index 20cbe98..cc13169 100644 --- a/tests/camera2/CameraStreamFixture.h +++ b/tests/camera2/CameraStreamFixture.h @@ -213,7 +213,7 @@ protected: } // CpuConsumer::FrameAvailableListener implementation - virtual void onFrameAvailable() { + virtual void onFrameAvailable(const BufferItem& /* item */) { ALOGV("Frame now available (start)"); Mutex::Autolock lock(mMutex); diff --git a/tests/camera2/camera2_utils.cpp b/tests/camera2/camera2_utils.cpp index 3c0767a..9cc6c90 100644 --- a/tests/camera2/camera2_utils.cpp +++ b/tests/camera2/camera2_utils.cpp @@ -574,7 +574,7 @@ status_t FrameWaiter::waitForFrame(nsecs_t timeout) { return OK; } -void FrameWaiter::onFrameAvailable() { +void FrameWaiter::onFrameAvailable(const BufferItem& /* item */) { Mutex::Autolock lock(mMutex); mPendingFrames++; mCondition.signal(); diff --git a/tests/camera2/camera2_utils.h b/tests/camera2/camera2_utils.h index 0cdf4a3..c1d1e72 100644 --- a/tests/camera2/camera2_utils.h +++ b/tests/camera2/camera2_utils.h @@ -231,7 +231,7 @@ class FrameWaiter : public CpuConsumer::FrameAvailableListener { */ status_t waitForFrame(nsecs_t timeout); - virtual void onFrameAvailable(); + virtual void onFrameAvailable(const BufferItem& item); int mPendingFrames; Mutex mMutex; |