diff options
author | James Dong <jdong@google.com> | 2011-05-24 08:04:45 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2011-05-24 08:04:45 -0700 |
commit | 9eff287f4f59d6a0c9ca1d5dd8a7bb6e64acf5a4 (patch) | |
tree | 69035429433775cb4720774943a63b95ca1f2535 | |
parent | 162f7d15ac5c8c23d1c3de171239f3a4e6e06b2a (diff) | |
parent | 77a88767df2992660fd3b38020c795baeb8d86e5 (diff) | |
download | frameworks_av-9eff287f4f59d6a0c9ca1d5dd8a7bb6e64acf5a4.zip frameworks_av-9eff287f4f59d6a0c9ca1d5dd8a7bb6e64acf5a4.tar.gz frameworks_av-9eff287f4f59d6a0c9ca1d5dd8a7bb6e64acf5a4.tar.bz2 |
resolved conflicts for merge of d5762583 to master
Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
-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 fb7a871..70053ea 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(); @@ -1081,6 +1085,7 @@ void AwesomePlayer::shutdownVideoDecoder_l() { usleep(1000); } IPCThreadState::self()->flushCommands(); + LOGI("video decoder shutdown completed"); } void AwesomePlayer::setNativeWindow_l(const sp<ANativeWindow> &native) { diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 0f0ffd4..ba495cc 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -3443,7 +3443,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); @@ -3505,6 +3505,7 @@ status_t OMXCodec::stop() { mLeftOverBuffer = NULL; } + CODEC_LOGI("stopping video source"); mSource->stop(); CODEC_LOGI("stopped in state %d", mState); |