diff options
author | Dan Stoza <stoza@google.com> | 2014-11-04 11:39:35 -0800 |
---|---|---|
committer | Dan Stoza <stoza@google.com> | 2014-11-04 11:39:35 -0800 |
commit | 32ef0cae6319c7d40d883c1c9839ff04b5ac9f72 (patch) | |
tree | 3e3722e973fa828d1f76de417e2df439564def36 /tests | |
parent | 0e6a158eaf1cb3309ea8737b268fb726324fa7fe (diff) | |
download | hardware_libhardware-32ef0cae6319c7d40d883c1c9839ff04b5ac9f72.zip hardware_libhardware-32ef0cae6319c7d40d883c1c9839ff04b5ac9f72.tar.gz hardware_libhardware-32ef0cae6319c7d40d883c1c9839ff04b5ac9f72.tar.bz2 |
Add a BufferItem parameter to onFrameAvailable
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents.
Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
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 f56daf0..0be0a14 100644 --- a/tests/camera2/CameraStreamFixture.h +++ b/tests/camera2/CameraStreamFixture.h @@ -130,7 +130,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; |