diff options
| author | Andreas Huber <andih@google.com> | 2009-11-19 15:01:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-19 15:01:45 -0800 |
| commit | 9da546f16810e8041046405ea4924f42ea5c1242 (patch) | |
| tree | d50e7380ed8304eecd029b9ce2dba80a46ea1c78 /include | |
| parent | 696cfa660e024cca3ea22ca3686283f622ddfdb2 (diff) | |
| parent | 2f5925e123afdaba79c7ca8ef6647e4b86cd5488 (diff) | |
| download | frameworks_av-9da546f16810e8041046405ea4924f42ea5c1242.zip frameworks_av-9da546f16810e8041046405ea4924f42ea5c1242.tar.gz frameworks_av-9da546f16810e8041046405ea4924f42ea5c1242.tar.bz2 | |
am f854e077: Merge change I8134d6ed into eclair
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-plus-aosp
* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaPlayerImpl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaPlayerImpl.h b/include/media/stagefright/MediaPlayerImpl.h index 53a2088..7adf836 100644 --- a/include/media/stagefright/MediaPlayerImpl.h +++ b/include/media/stagefright/MediaPlayerImpl.h @@ -112,7 +112,9 @@ private: MediaSource *makeShoutcastSource(const char *path); - void displayOrDiscardFrame(MediaBuffer *buffer, int64_t pts_us); + void displayOrDiscardFrame( + MediaBuffer **lastBuffer, MediaBuffer *buffer, int64_t pts_us); + void populateISurface(); void depopulateISurface(); void sendFrameToISurface(MediaBuffer *buffer); |