commit aa1a694dc78e5201fc83fe3d710a6e43eb62831a
author Andreas Huber <andih@google.com> Mon Oct 04 11:45:56 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 04 11:45:56 2010 -0700
tree ad14d3f49de56ae966229f12f5e1f3b56306dd7b
parent 7fa693740756123fa9d05e62fb47aae5d703c71d
parent 05f6787b887f0e731e7372ede0fb955e8939f703

Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 3975866..040e27d 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -484,6 +484,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) {