Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb
This commit is contained in:
committed by
Android (Google) Code Review
commit
79c4648597
@@ -378,14 +378,11 @@ 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;
|
||||
|
||||
@@ -411,10 +408,6 @@ void AwesomePlayer::reset_l() {
|
||||
}
|
||||
}
|
||||
|
||||
if (mFlags & PREPARING) {
|
||||
LOGI("waiting until preparation is completes.");
|
||||
}
|
||||
|
||||
while (mFlags & PREPARING) {
|
||||
mPreparedCondition.wait(mLock);
|
||||
}
|
||||
@@ -438,8 +431,6 @@ void AwesomePlayer::reset_l() {
|
||||
}
|
||||
mAudioSource.clear();
|
||||
|
||||
LOGI("audio source cleared");
|
||||
|
||||
mTimeSource = NULL;
|
||||
|
||||
delete mAudioPlayer;
|
||||
@@ -480,8 +471,6 @@ void AwesomePlayer::reset_l() {
|
||||
IPCThreadState::self()->flushCommands();
|
||||
}
|
||||
|
||||
LOGI("video source cleared");
|
||||
|
||||
mDurationUs = -1;
|
||||
mFlags = 0;
|
||||
mExtractorFlags = 0;
|
||||
@@ -498,8 +487,6 @@ void AwesomePlayer::reset_l() {
|
||||
mFileSource.clear();
|
||||
|
||||
mBitrate = -1;
|
||||
|
||||
LOGI("reset_l completed");
|
||||
}
|
||||
|
||||
void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) {
|
||||
|
||||
Reference in New Issue
Block a user