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

Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""

Browse Source
This commit is contained in:
James Dong
2011-07-14 16:42:34 -07:00
committed by Android (Google) Code Review
parent 649a1418d9 2c17f05a81
commit 8a65e1fb57
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libstagefright/AwesomePlayer.cpp
View File

@@ -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();

3
media/libstagefright/OMXCodec.cpp
View File

@@ -3539,7 +3539,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);
@@ -3601,7 +3601,6 @@ status_t OMXCodec::stop() {
mLeftOverBuffer = NULL;
}
CODEC_LOGI("stopping video source");
mSource->stop();
CODEC_LOGI("stopped in state %d", mState);