commit 3d29e8c8465bfa632eb250d533a1cd8e77b85a66
author Andreas Huber <andih@google.com> Mon Oct 04 11:51:55 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 04 11:51:55 2010 -0700
tree 86217d59f2bc45851c87231e87264c90b7d6d56e
parent d84d9f40647644efcc8dcdaaad218b46c2208510
parent dfd03fe99336792b6dae6c4c9fd5f5ba157e054c

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.

media/libstagefright/AwesomePlayer.cpp

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 @@
 
         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) {