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 /include | |
| 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 'include')
| -rw-r--r-- | include/camera/ProCamera.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/SurfaceMediaSource.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/camera/ProCamera.h b/include/camera/ProCamera.h index 83a3028..e9b687a 100644 --- a/include/camera/ProCamera.h +++ b/include/camera/ProCamera.h @@ -265,7 +265,7 @@ private: } protected: - virtual void onFrameAvailable() { + virtual void onFrameAvailable(const BufferItem& /* item */) { sp<ProCamera> c = mCamera.promote(); if (c.get() != NULL) { c->onFrameAvailable(mStreamId); diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h index 43b75fd..d15a226 100644 --- a/include/media/stagefright/SurfaceMediaSource.h +++ b/include/media/stagefright/SurfaceMediaSource.h @@ -124,7 +124,7 @@ protected: // Implementation of the BufferQueue::ConsumerListener interface. These // calls are used to notify the Surface of asynchronous events in the // BufferQueue. - virtual void onFrameAvailable(); + virtual void onFrameAvailable(const BufferItem& item); // Used as a hook to BufferQueue::disconnect() // This is called by the client side when it is done |