From 4a9375ef2a06fc36ec308835ef9e7e4eea2ba69f Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 9 Feb 2010 11:54:33 -0800 Subject: A little less verbosity in stagefright and special treatment for the error state while shutting down. --- media/libstagefright/AwesomePlayer.cpp | 2 +- media/libstagefright/MPEG4Extractor.cpp | 4 ++-- media/libstagefright/OMXCodec.cpp | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'media') diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index d25f7f6..c0a2f5b 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -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; diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 6274a6c..e41b366 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -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); } diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 0355a82..7c7c9e2 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -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; } -- cgit v1.1