summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/AwesomePlayer.cpp
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-01-21 14:50:32 -0800
committerCarl Shapiro <cshapiro@google.com>2011-01-21 14:52:51 -0800
commit8aded52c4d6962da5357d4bfc0bca4be3aa331ef (patch)
treec262a3454ed8d461d2aee932b2e0be43fef73e5d /media/libstagefright/AwesomePlayer.cpp
parent7fac331b39ca49ce49a67e425dcc031a3cb9e97f (diff)
downloadframeworks_av-8aded52c4d6962da5357d4bfc0bca4be3aa331ef.zip
frameworks_av-8aded52c4d6962da5357d4bfc0bca4be3aa331ef.tar.gz
frameworks_av-8aded52c4d6962da5357d4bfc0bca4be3aa331ef.tar.bz2
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c. Bug: 3378444 Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
-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) {