diff options
author | Andreas Huber <andih@google.com> | 2011-01-28 10:30:47 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-01-28 10:30:56 -0800 |
commit | d916339e2fe173c32cdfa21671dade32a254b1ad (patch) | |
tree | a6acb23c330977a8b6814fb21333a9b25f561d72 /media/libstagefright | |
parent | b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4 (diff) | |
download | frameworks_base-d916339e2fe173c32cdfa21671dade32a254b1ad.zip frameworks_base-d916339e2fe173c32cdfa21671dade32a254b1ad.tar.gz frameworks_base-d916339e2fe173c32cdfa21671dade32a254b1ad.tar.bz2 |
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
This reverts commit aac2e9e1566a3bb0ef811ebd3a56b538324c95c1.
Change-Id: Ic84dfa829981fdc1a1330ccfe6b9dccf64a80719
related-to-bug: 3392386
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 13 |
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) { |