diff options
| author | Andreas Huber <andih@google.com> | 2010-10-04 11:51:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 11:51:55 -0700 |
| commit | 05425bc043f6dc45cc093065d5270b70100681b5 (patch) | |
| tree | 50316f537529d6c4d64dac6d69b5b3fa7ee2bb04 /media/libstagefright/AwesomePlayer.cpp | |
| parent | 0074d69add482a351b4e0004d62b1cb8ed475505 (diff) | |
| parent | 8b62c6ae868e01f4c5783566fe2fa20408b61caf (diff) | |
| download | frameworks_av-05425bc043f6dc45cc093065d5270b70100681b5.zip frameworks_av-05425bc043f6dc45cc093065d5270b70100681b5.tar.gz frameworks_av-05425bc043f6dc45cc093065d5270b70100681b5.tar.bz2 | |
am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread
Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c'
* commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c':
Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index e72f28e..31c03ad 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -487,6 +487,10 @@ void AwesomePlayer::onBufferingUpdate() { if (eos) { notifyListener_l(MEDIA_BUFFERING_UPDATE, 100); + if (mFlags & PREPARING) { + LOGV("cache has reached EOS, prepare is done."); + finishAsyncPrepare_l(); + } } else { off_t size; if (mDurationUs >= 0 && mCachedSource->getSize(&size) == OK) { |