diff options
| author | Andreas Huber <andih@google.com> | 2010-09-03 14:13:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 14:13:19 -0700 |
| commit | 511ea9823b1ab1d45eb86607cb291878c70b26ae (patch) | |
| tree | c0f9efef27793a70e20c9671ce961494a554dcf9 /media/libstagefright/include/AwesomePlayer.h | |
| parent | 35b8b488e0822854d411976710ed55f3a1c72bf3 (diff) | |
| parent | 6f6bc92bc775bc6ddb6d85a45030b217ceb28976 (diff) | |
| download | frameworks_av-511ea9823b1ab1d45eb86607cb291878c70b26ae.zip frameworks_av-511ea9823b1ab1d45eb86607cb291878c70b26ae.tar.gz frameworks_av-511ea9823b1ab1d45eb86607cb291878c70b26ae.tar.bz2 | |
am af7a7c34: am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
Merge commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc'
* commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc':
Properly buffer a certain amount of data on streaming sources before finishing prepare().
Diffstat (limited to 'media/libstagefright/include/AwesomePlayer.h')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index f34eb45..d4338c6 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -241,6 +241,9 @@ private: void onCheckAudioStatus(); void onPrepareAsyncEvent(); void abortPrepare(status_t err); + void finishAsyncPrepare_l(); + + bool getCachedDuration_l(int64_t *durationUs, bool *eos); status_t finishSetDataSource_l(); |