diff options
| author | 2011-03-28 14:48:28 -0700 | |
|---|---|---|
| committer | 2011-03-28 14:48:28 -0700 | |
| commit | 3a28b022bcf06da7d0019abe3d569322c7aaee82 (patch) | |
| tree | fd91c67ecb9f7f1e4f75bd18a7aea0007cbc58cc | |
| parent | 45538666db67a3fd528765b22bd4da30280128ef (diff) | |
Ignore OMX codec messages once we're in ERROR state.
Change-Id: I2bdf58ed705a641be1f3aec89fa41cada6acfc96
related-to-bug: 4175573
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 5 | ||||
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index a6a34b363092..904bd6263530 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1912,6 +1912,11 @@ OMXCodec::BufferInfo* OMXCodec::dequeueBufferFromNativeWindow() { } void OMXCodec::on_message(const omx_message &msg) { + if (mState == ERROR) { + LOGW("Dropping OMX message - we're in ERROR state."); + return; + } + switch (msg.type) { case omx_message::EVENT: { diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 6cbd599d067e..cdce772d8917 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #define LOG_TAG "OMXNodeInstance" #include <utils/Log.h> |