commit b64747693f80ce8d88d4d0e0cc040b4623c4d871
author Andreas Huber <andih@google.com> Mon Jan 24 13:31:00 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 24 13:31:00 2011 -0800
tree 329dcb5d4a65921d185ffa553d2e3ca7fb2a0cb4
parent 7e9d76e8fbadf3acb73bc61452e6f7092bf54736
parent 339b2ac29492def972b9829efa0d5e1f4b1363ee

am bd6ac1e4: am da6f9295: Merge "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)" into honeycomb

* commit 'bd6ac1e4d444e69d31677fec41d4d1a265098f08':
  Make AwesomePlayer's reset process more verbose to track down ANRs (again)

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 89b3dab..11ac56c 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -378,11 +378,14 @@
 }
 
 void AwesomePlayer::reset() {
+    LOGI("reset");
+
     Mutex::Autolock autoLock(mLock);
     reset_l();
 }
 
 void AwesomePlayer::reset_l() {
+    LOGI("reset_l");
     mDisplayWidth = 0;
     mDisplayHeight = 0;
 
@@ -408,6 +411,10 @@
         }
     }
 
+    if (mFlags & PREPARING) {
+        LOGI("waiting until preparation is completes.");
+    }
+
     while (mFlags & PREPARING) {
         mPreparedCondition.wait(mLock);
     }
@@ -431,6 +438,8 @@
     }
     mAudioSource.clear();
 
+    LOGI("audio source cleared");
+
     mTimeSource = NULL;
 
     delete mAudioPlayer;
@@ -471,6 +480,8 @@
         IPCThreadState::self()->flushCommands();
     }
 
+    LOGI("video source cleared");
+
     mDurationUs = -1;
     mFlags = 0;
     mExtractorFlags = 0;
@@ -487,6 +498,8 @@
     mFileSource.clear();
 
     mBitrate = -1;
+
+    LOGI("reset_l completed");
 }
 
 void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) {