summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/AwesomePlayer.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-07-14 16:22:47 -0700
committerJames Dong <jdong@google.com>2011-07-14 16:22:47 -0700
commita3f4d7f096e5c91dc6af085761b1459866c043d9 (patch)
tree78f4f6a7a26553be4f4a2e6260c41901ce5849b9 /media/libstagefright/AwesomePlayer.cpp
parent9cded98816c40fd55053b1e38fc7fd8a68da8866 (diff)
downloadframeworks_av-a3f4d7f096e5c91dc6af085761b1459866c043d9.zip
frameworks_av-a3f4d7f096e5c91dc6af085761b1459866c043d9.tar.gz
frameworks_av-a3f4d7f096e5c91dc6af085761b1459866c043d9.tar.bz2
Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."
This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844. Conflicts: media/libstagefright/AwesomePlayer.cpp Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 77c25d1..a6b2a79 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();