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 | 8b49e97db9c46c63192989172ea03cd8751f2551 (patch) | |
| tree | 72e94de4b14b0419be9ef0079ca347b129d7685c /include | |
| parent | c5a605240115ad5eb8edcc7976c8083221754634 (diff) | |
| parent | f854e0770207e93ef9d1bf6d50ed18537a107ca4 (diff) | |
| download | frameworks_base-8b49e97db9c46c63192989172ea03cd8751f2551.zip frameworks_base-8b49e97db9c46c63192989172ea03cd8751f2551.tar.gz frameworks_base-8b49e97db9c46c63192989172ea03cd8751f2551.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); |