diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-31 11:19:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-31 11:19:38 -0700 |
| commit | 371e121745c2e43e3c26fd1a854eaf6d3324f057 (patch) | |
| tree | 0f380a6b6918d35d612cbb6ec8a766e557571245 /media | |
| parent | 8836f8e0bfc64dce81963db89dfc5d0f11c29483 (diff) | |
| parent | 8b1525663322685ff34d9c09176feebd102e1c3d (diff) | |
| download | frameworks_av-371e121745c2e43e3c26fd1a854eaf6d3324f057.zip frameworks_av-371e121745c2e43e3c26fd1a854eaf6d3324f057.tar.gz frameworks_av-371e121745c2e43e3c26fd1a854eaf6d3324f057.tar.bz2 | |
am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"
* commit '8b1525663322685ff34d9c09176feebd102e1c3d':
OMXCodec: enhance error handling of OMX IL client
Diffstat (limited to 'media')
| -rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index fde7ebf..a6636a1 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -2048,9 +2048,13 @@ int64_t OMXCodec::getDecodingTimeUs() { } void OMXCodec::on_message(const omx_message &msg) { + // even in error state, we still need to process EMPTY_BUFFER_DONE + // and FILL_BUFFER_DONE event, or we will run into mediaserver crash issue if (mState == ERROR) { - ALOGW("Dropping OMX message - we're in ERROR state."); - return; + if (msg.type == omx_message::EVENT) { + ALOGW("Dropping OMX message - we're in ERROR state."); + return; + } } switch (msg.type) { |