diff options
| author | Dan Stoza <stoza@google.com> | 2014-11-07 20:03:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 20:03:45 +0000 |
| commit | 048e913d58a59055af81dfa362db2c4ccf00f75a (patch) | |
| tree | c707c6ae0286b1dc4a10fb2b9e5f13046ca18c8b /include/media | |
| parent | 72e4a570f52c0a866d6952d0a1edd07d2c2194fc (diff) | |
| parent | f8d051fee37b1a0734e4142072d3053fed8df161 (diff) | |
| download | frameworks_av-048e913d58a59055af81dfa362db2c4ccf00f75a.zip frameworks_av-048e913d58a59055af81dfa362db2c4ccf00f75a.tar.gz frameworks_av-048e913d58a59055af81dfa362db2c4ccf00f75a.tar.bz2 | |
am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit 'f8d051fee37b1a0734e4142072d3053fed8df161':
Add a BufferItem parameter to onFrameAvailable
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/SurfaceMediaSource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h index ffe4f4c..2177c00 100644 --- a/include/media/stagefright/SurfaceMediaSource.h +++ b/include/media/stagefright/SurfaceMediaSource.h @@ -126,7 +126,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 |