Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb

Browse Source
This commit is contained in:
Andreas Huber
2011-01-24 10:45:59 -08:00
committed by Android (Google) Code Review
parent 3648691259 aac2e9e156
commit da6f929584
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/libstagefright/AwesomePlayer.cpp
View File

@@ -378,11 +378,14 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) {
} }
void AwesomePlayer::reset() { void AwesomePlayer::reset() {
LOGI("reset");
Mutex::Autolock autoLock(mLock); Mutex::Autolock autoLock(mLock);
reset_l(); reset_l();
} }
void AwesomePlayer::reset_l() { void AwesomePlayer::reset_l() {
LOGI("reset_l");
mDisplayWidth = 0; mDisplayWidth = 0;
mDisplayHeight = 0; mDisplayHeight = 0;
@@ -408,6 +411,10 @@ void AwesomePlayer::reset_l() {
} }
} }
if (mFlags & PREPARING) {
LOGI("waiting until preparation is completes.");
}
while (mFlags & PREPARING) { while (mFlags & PREPARING) {
mPreparedCondition.wait(mLock); mPreparedCondition.wait(mLock);
} }
@@ -431,6 +438,8 @@ void AwesomePlayer::reset_l() {
} }
mAudioSource.clear(); mAudioSource.clear();
LOGI("audio source cleared");
mTimeSource = NULL; mTimeSource = NULL;
delete mAudioPlayer; delete mAudioPlayer;
@@ -471,6 +480,8 @@ void AwesomePlayer::reset_l() {
IPCThreadState::self()->flushCommands(); IPCThreadState::self()->flushCommands();
} }
LOGI("video source cleared");
mDurationUs = -1; mDurationUs = -1;
mFlags = 0; mFlags = 0;
mExtractorFlags = 0; mExtractorFlags = 0;
@@ -487,6 +498,8 @@ void AwesomePlayer::reset_l() {
mFileSource.clear(); mFileSource.clear();
mBitrate = -1; mBitrate = -1;
LOGI("reset_l completed");
} }
void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) { void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) {