summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-28 11:53:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-28 11:53:50 -0800
commit02235c39040120295314a402841b17f68752ec99 (patch)
tree7a1fc3fdd42c5092939253c204dc26511522622a /media
parent54f533e7a1c0753d52595eb4d42295d654fd1a97 (diff)
parent60e91863e185f84ec36fa3293e57ac9aa8500749 (diff)
downloadframeworks_av-02235c39040120295314a402841b17f68752ec99.zip
frameworks_av-02235c39040120295314a402841b17f68752ec99.tar.gz
frameworks_av-02235c39040120295314a402841b17f68752ec99.tar.bz2
am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb
* commit '35a1f771759459fc6c9b355d548c5b97cd50e110': Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 11ac56c..89b3dab 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -378,14 +378,11 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) {
}
void AwesomePlayer::reset() {
- LOGI("reset");
-
Mutex::Autolock autoLock(mLock);
reset_l();
}
void AwesomePlayer::reset_l() {
- LOGI("reset_l");
mDisplayWidth = 0;
mDisplayHeight = 0;
@@ -411,10 +408,6 @@ void AwesomePlayer::reset_l() {
}
}
- if (mFlags & PREPARING) {
- LOGI("waiting until preparation is completes.");
- }
-
while (mFlags & PREPARING) {
mPreparedCondition.wait(mLock);
}
@@ -438,8 +431,6 @@ void AwesomePlayer::reset_l() {
}
mAudioSource.clear();
- LOGI("audio source cleared");
-
mTimeSource = NULL;
delete mAudioPlayer;
@@ -480,8 +471,6 @@ void AwesomePlayer::reset_l() {
IPCThreadState::self()->flushCommands();
}
- LOGI("video source cleared");
-
mDurationUs = -1;
mFlags = 0;
mExtractorFlags = 0;
@@ -498,8 +487,6 @@ void AwesomePlayer::reset_l() {
mFileSource.clear();
mBitrate = -1;
-
- LOGI("reset_l completed");
}
void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) {