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

Merge "A little less verbosity in stagefright and special treatment for the error state while shutting down."

Browse Source
This commit is contained in:
Andreas Huber
2010-02-09 12:10:31 -08:00
committed by Android (Google) Code Review
parent 8e867eb454 4a9375ef2a
commit e33813dfab
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/AwesomePlayer.cpp
View File

@@ -725,7 +725,7 @@ void AwesomePlayer::onVideoEvent() {
if (latenessUs > 40000) {
// We're more than 40ms late.
LOGI("we're late by %lld us (%.2f secs)", latenessUs, latenessUs / 1E6);
LOGV("we're late by %lld us (%.2f secs)", latenessUs, latenessUs / 1E6);
mVideoBuffer->release();
mVideoBuffer = NULL;

4
media/libstagefright/MPEG4Extractor.cpp
View File

@@ -1198,7 +1198,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
CHECK(mLastTrack->meta->findInt32(kKeySampleRate, &prevSampleRate));
if (prevSampleRate != sampleRate) {
LOGW("mpeg4 audio sample rate different from previous setting. "
LOGV("mpeg4 audio sample rate different from previous setting. "
"was: %d, now: %d", prevSampleRate, sampleRate);
}
@@ -1208,7 +1208,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
CHECK(mLastTrack->meta->findInt32(kKeyChannelCount, &prevChannelCount));
if (prevChannelCount != numChannels) {
LOGW("mpeg4 audio channel count different from previous setting. "
LOGV("mpeg4 audio channel count different from previous setting. "
"was: %d, now: %d", prevChannelCount, numChannels);
}

7
media/libstagefright/OMXCodec.cpp
View File

@@ -1284,7 +1284,8 @@ void OMXCodec::on_message(const omx_message &msg) {
CHECK_EQ(err, OK);
buffers->removeAt(i);
} else if (mPortStatus[kPortIndexInput] != SHUTTING_DOWN) {
} else if (mState != ERROR
&& mPortStatus[kPortIndexInput] != SHUTTING_DOWN) {
CHECK_EQ(mPortStatus[kPortIndexInput], ENABLED);
drainInputBuffer(&buffers->editItemAt(i));
}
@@ -2250,7 +2251,7 @@ status_t OMXCodec::start(MetaData *) {
}
status_t OMXCodec::stop() {
CODEC_LOGV("stop");
CODEC_LOGV("stop mState=%d", mState);
Mutex::Autolock autoLock(mLock);
@@ -2309,6 +2310,8 @@ status_t OMXCodec::stop() {
mSource->stop();
CODEC_LOGV("stopped");
return OK;
}