diff options
| author | James Dong <jdong@google.com> | 2011-07-14 16:42:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-14 16:42:34 -0700 |
| commit | dc3d6784c73882c888423f0cb9b4de1b14e1dc02 (patch) | |
| tree | b78f15ad04eebe599cda79ee280032f62033b5e9 /media/libstagefright/AwesomePlayer.cpp | |
| parent | 6f93135e5c8945ad2589af0c01652bc104eae819 (diff) | |
| parent | a3f4d7f096e5c91dc6af085761b1459866c043d9 (diff) | |
| download | frameworks_av-dc3d6784c73882c888423f0cb9b4de1b14e1dc02.zip frameworks_av-dc3d6784c73882c888423f0cb9b4de1b14e1dc02.tar.gz frameworks_av-dc3d6784c73882c888423f0cb9b4de1b14e1dc02.tar.bz2 | |
Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 788464e..0098537 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -453,7 +453,6 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { } void AwesomePlayer::reset() { - LOGI("reset"); Mutex::Autolock autoLock(mLock); reset_l(); } @@ -467,10 +466,8 @@ void AwesomePlayer::reset_l() { Playback::STOP, 0); mDecryptHandle = NULL; mDrmManagerClient = NULL; - LOGI("DRM manager client stopped"); } - if (mFlags & PLAYING) { uint32_t params = IMediaPlayerService::kBatteryDataTrackDecoder; if ((mAudioSource != NULL) && (mAudioSource != mAudioTrack)) { @@ -503,7 +500,6 @@ void AwesomePlayer::reset_l() { mPreparedCondition.wait(mLock); } - LOGI("cancel player events"); cancelPlayerEvents(); mWVMExtractor.clear(); |