summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2011-01-06 10:26:36 -0800
committer Andreas Huber <andih@google.com> 2011-01-06 12:42:13 -0800
commiteec06d3679db96ec41a017d542c878f3b7070b0e (patch)
tree8d9cb1240868adf26d267cfea4ffe8c2ee2e4e7c
parent42edf0f8cf8ca85dd5010558ff399e2c9a4c779c (diff)
If we failed to initialize the codec after transitioning to IDLE state, don't assert
during shutdown. Change-Id: I40ac44260fb136c15d6dcb9f5ad62211640c66ec related-to-bug: 3328222
-rw-r--r--media/libstagefright/OMXCodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index f63774a672cf..8efd963ea723 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1506,7 +1506,7 @@ void OMXCodec::setComponentRole() {
OMXCodec::~OMXCodec() {
mSource.clear();
- CHECK(mState == LOADED || mState == ERROR);
+ CHECK(mState == LOADED || mState == ERROR || mState == LOADED_TO_IDLE);
status_t err = mOMX->freeNode(mNode);
CHECK_EQ(err, (status_t)OK);