summaryrefslogtreecommitdiffstats
path: root/media
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
commit2c17f05a81e78690bc9f0a5ac7ececdc329fc321 (patch)
treec7137fdafda8c66fdc9b40ba2f196df931320c3e /media
parent9cba686366870b3a4c69bcec0eb4200352ce481d (diff)
downloadframeworks_base-2c17f05a81e78690bc9f0a5ac7ececdc329fc321.zip
frameworks_base-2c17f05a81e78690bc9f0a5ac7ececdc329fc321.tar.gz
frameworks_base-2c17f05a81e78690bc9f0a5ac7ececdc329fc321.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')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp4
-rwxr-xr-xmedia/libstagefright/OMXCodec.cpp3
2 files changed, 1 insertions, 6 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();
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 3b05752..4d553e9 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -3614,7 +3614,7 @@ status_t OMXCodec::start(MetaData *meta) {
}
status_t OMXCodec::stop() {
- CODEC_LOGI("stop mState=%d", mState);
+ CODEC_LOGV("stop mState=%d", mState);
Mutex::Autolock autoLock(mLock);
@@ -3676,7 +3676,6 @@ status_t OMXCodec::stop() {
mLeftOverBuffer = NULL;
}
- CODEC_LOGI("stopping video source");
mSource->stop();
CODEC_LOGI("stopped in state %d", mState);