diff options
| author | Andreas Huber <andih@google.com> | 2010-02-09 11:54:33 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-02-09 11:54:33 -0800 |
| commit | ec9dd59902c8beea4ba6a842f3a843d46150d949 (patch) | |
| tree | 234af5bf337db4cb040421a9dd70c60f4cd3f149 /media/libstagefright/OMXCodec.cpp | |
| parent | 569e7f1b1444194d1aca5a0b23de154565ba12da (diff) | |
| download | frameworks_av-ec9dd59902c8beea4ba6a842f3a843d46150d949.zip frameworks_av-ec9dd59902c8beea4ba6a842f3a843d46150d949.tar.gz frameworks_av-ec9dd59902c8beea4ba6a842f3a843d46150d949.tar.bz2 | |
A little less verbosity in stagefright and special treatment for the error state while shutting down.
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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; } |