diff options
author | James Dong <jdong@google.com> | 2011-05-23 10:26:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 10:26:40 -0700 |
commit | 77a88767df2992660fd3b38020c795baeb8d86e5 (patch) | |
tree | e517ef91449cbe27a2e849aec5d2aab27ca140fe /media/libstagefright | |
parent | cb83fae8b1f07cb0c8fe9433ae00b56ce7c6a6e3 (diff) | |
parent | 003f6d613698484869476f01aa3fe2c28d3120bc (diff) | |
download | frameworks_av-77a88767df2992660fd3b38020c795baeb8d86e5.zip frameworks_av-77a88767df2992660fd3b38020c795baeb8d86e5.tar.gz frameworks_av-77a88767df2992660fd3b38020c795baeb8d86e5.tar.bz2 |
am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
Add some logging to track down where ANR happens during MediaPlayer._release().
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 5 | ||||
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index a8e0a4d..5962454 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -400,6 +400,7 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { } void AwesomePlayer::reset() { + LOGI("reset"); Mutex::Autolock autoLock(mLock); reset_l(); } @@ -413,8 +414,10 @@ 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)) { @@ -447,6 +450,7 @@ void AwesomePlayer::reset_l() { mPreparedCondition.wait(mLock); } + LOGI("cancel player events"); cancelPlayerEvents(); mWVMExtractor.clear(); @@ -496,6 +500,7 @@ void AwesomePlayer::reset_l() { usleep(1000); } IPCThreadState::self()->flushCommands(); + LOGI("video decoder shutdown completed"); } mDurationUs = -1; diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 5d26fd5..e96ce28 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -3339,7 +3339,7 @@ status_t OMXCodec::start(MetaData *meta) { } status_t OMXCodec::stop() { - CODEC_LOGV("stop mState=%d", mState); + CODEC_LOGI("stop mState=%d", mState); Mutex::Autolock autoLock(mLock); @@ -3401,6 +3401,7 @@ status_t OMXCodec::stop() { mLeftOverBuffer = NULL; } + CODEC_LOGI("stopping video source"); mSource->stop(); CODEC_LOGI("stopped in state %d", mState); |