diff options
author | Andreas Huber <andih@google.com> | 2011-02-03 16:09:21 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-02-03 16:09:57 -0800 |
commit | 553ab646159d94747dab5c3893ea51c8ec2463d9 (patch) | |
tree | bbccaef19cb69e2415c0b614a0f7e9883b0cb9a7 /media | |
parent | 856990b491d84b7ed4fefe337485c8997ba9dd02 (diff) | |
download | frameworks_av-553ab646159d94747dab5c3893ea51c8ec2463d9.zip frameworks_av-553ab646159d94747dab5c3893ea51c8ec2463d9.tar.gz frameworks_av-553ab646159d94747dab5c3893ea51c8ec2463d9.tar.bz2 |
Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)
Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 13 | ||||
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 89b3dab..11ac56c 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -378,11 +378,14 @@ 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; @@ -408,6 +411,10 @@ void AwesomePlayer::reset_l() { } } + if (mFlags & PREPARING) { + LOGI("waiting until preparation is completes."); + } + while (mFlags & PREPARING) { mPreparedCondition.wait(mLock); } @@ -431,6 +438,8 @@ void AwesomePlayer::reset_l() { } mAudioSource.clear(); + LOGI("audio source cleared"); + mTimeSource = NULL; delete mAudioPlayer; @@ -471,6 +480,8 @@ void AwesomePlayer::reset_l() { IPCThreadState::self()->flushCommands(); } + LOGI("video source cleared"); + mDurationUs = -1; mFlags = 0; mExtractorFlags = 0; @@ -487,6 +498,8 @@ void AwesomePlayer::reset_l() { mFileSource.clear(); mBitrate = -1; + + LOGI("reset_l completed"); } void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) { diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 2a19b25..247ace7 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -3269,7 +3269,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); |