diff options
| author | Dan Stoza <stoza@google.com> | 2014-11-07 19:58:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 19:58:27 +0000 |
| commit | f8d051fee37b1a0734e4142072d3053fed8df161 (patch) | |
| tree | fd1544d8558047bf35d9b9ee84e52f3b080173aa /include | |
| parent | caf27abc62e15abc628c04183d3188728fe98990 (diff) | |
| parent | 034d674721029e3b7e34fe30ee31814c521b62bf (diff) | |
| download | frameworks_av-f8d051fee37b1a0734e4142072d3053fed8df161.zip frameworks_av-f8d051fee37b1a0734e4142072d3053fed8df161.tar.gz frameworks_av-f8d051fee37b1a0734e4142072d3053fed8df161.tar.bz2 | |
am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '034d674721029e3b7e34fe30ee31814c521b62bf':
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 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 |